![Kees Cook](/assets/img/avatar_default.png)
The kzalloc() function has a 2-factor argument form, kcalloc(). This patch replaces cases of: kzalloc(a * b, gfp) with: kcalloc(a * b, gfp) as well as handling cases of: kzalloc(a * b * c, gfp) with: kzalloc(array3_size(a, b, c), gfp) as it's slightly less ugly than: kzalloc_array(array_size(a, b), c, gfp) This does, however, attempt to ignore constant size factors like: kzalloc(4 * 1024, gfp) though any constants defined via macros get caught up in the conversion. Any factors with a sizeof() of "unsigned char", "char", and "u8" were dropped, since they're redundant. The Coccinelle script used for this was: // Fix redundant parens around sizeof(). @@ type TYPE; expression THING, E; @@ ( kzalloc( - (sizeof(TYPE)) * E + sizeof(TYPE) * E , ...) | kzalloc( - (sizeof(THING)) * E + sizeof(THING) * E , ...) ) // Drop single-byte sizes and redundant parens. @@ expression COUNT; typedef u8; typedef __u8; @@ ( kzalloc( - sizeof(u8) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(__u8) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(char) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(unsigned char) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(u8) * COUNT + COUNT , ...) | kzalloc( - sizeof(__u8) * COUNT + COUNT , ...) | kzalloc( - sizeof(char) * COUNT + COUNT , ...) | kzalloc( - sizeof(unsigned char) * COUNT + COUNT , ...) ) // 2-factor product with sizeof(type/expression) and identifier or constant. @@ type TYPE; expression THING; identifier COUNT_ID; constant COUNT_CONST; @@ ( - kzalloc + kcalloc ( - sizeof(TYPE) * (COUNT_ID) + COUNT_ID, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * COUNT_ID + COUNT_ID, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * (COUNT_CONST) + COUNT_CONST, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * COUNT_CONST + COUNT_CONST, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * (COUNT_ID) + COUNT_ID, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * COUNT_ID + COUNT_ID, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * (COUNT_CONST) + COUNT_CONST, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * COUNT_CONST + COUNT_CONST, sizeof(THING) , ...) ) // 2-factor product, only identifiers. @@ identifier SIZE, COUNT; @@ - kzalloc + kcalloc ( - SIZE * COUNT + COUNT, SIZE , ...) // 3-factor product with 1 sizeof(type) or sizeof(expression), with // redundant parens removed. @@ expression THING; identifier STRIDE, COUNT; type TYPE; @@ ( kzalloc( - sizeof(TYPE) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(TYPE) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(TYPE) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(TYPE) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(THING) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc( - sizeof(THING) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc( - sizeof(THING) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc( - sizeof(THING) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) ) // 3-factor product with 2 sizeof(variable), with redundant parens removed. @@ expression THING1, THING2; identifier COUNT; type TYPE1, TYPE2; @@ ( kzalloc( - sizeof(TYPE1) * sizeof(TYPE2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | kzalloc( - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | kzalloc( - sizeof(THING1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | kzalloc( - sizeof(THING1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | kzalloc( - sizeof(TYPE1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) | kzalloc( - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) ) // 3-factor product, only identifiers, with redundant parens removed. @@ identifier STRIDE, SIZE, COUNT; @@ ( kzalloc( - (COUNT) * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - (COUNT) * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - (COUNT) * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - (COUNT) * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) ) // Any remaining multi-factor products, first at least 3-factor products, // when they're not all constants... @@ expression E1, E2, E3; constant C1, C2, C3; @@ ( kzalloc(C1 * C2 * C3, ...) | kzalloc( - (E1) * E2 * E3 + array3_size(E1, E2, E3) , ...) | kzalloc( - (E1) * (E2) * E3 + array3_size(E1, E2, E3) , ...) | kzalloc( - (E1) * (E2) * (E3) + array3_size(E1, E2, E3) , ...) | kzalloc( - E1 * E2 * E3 + array3_size(E1, E2, E3) , ...) ) // And then all remaining 2 factors products when they're not all constants, // keeping sizeof() as the second factor argument. @@ expression THING, E1, E2; type TYPE; constant C1, C2, C3; @@ ( kzalloc(sizeof(THING) * C2, ...) | kzalloc(sizeof(TYPE) * C2, ...) | kzalloc(C1 * C2 * C3, ...) | kzalloc(C1 * C2, ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * (E2) + E2, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * E2 + E2, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * (E2) + E2, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * E2 + E2, sizeof(THING) , ...) | - kzalloc + kcalloc ( - (E1) * E2 + E1, E2 , ...) | - kzalloc + kcalloc ( - (E1) * (E2) + E1, E2 , ...) | - kzalloc + kcalloc ( - E1 * E2 + E1, E2 , ...) ) Signed-off-by: Kees Cook <keescook@chromium.org>
162 lines
3.7 KiB
C
162 lines
3.7 KiB
C
/* $Id: fsm.c,v 1.14.6.4 2001/09/23 22:24:47 kai Exp $
|
|
*
|
|
* Finite state machine
|
|
*
|
|
* Author Karsten Keil
|
|
* Copyright by Karsten Keil <keil@isdn4linux.de>
|
|
* by Kai Germaschewski <kai.germaschewski@gmx.de>
|
|
*
|
|
* This software may be used and distributed according to the terms
|
|
* of the GNU General Public License, incorporated herein by reference.
|
|
*
|
|
* Thanks to Jan den Ouden
|
|
* Fritz Elfert
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/init.h>
|
|
#include "hisax.h"
|
|
|
|
#define FSM_TIMER_DEBUG 0
|
|
|
|
int
|
|
FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount)
|
|
{
|
|
int i;
|
|
|
|
fsm->jumpmatrix =
|
|
kzalloc(array3_size(sizeof(FSMFNPTR), fsm->state_count,
|
|
fsm->event_count),
|
|
GFP_KERNEL);
|
|
if (!fsm->jumpmatrix)
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < fncount; i++)
|
|
if ((fnlist[i].state >= fsm->state_count) || (fnlist[i].event >= fsm->event_count)) {
|
|
printk(KERN_ERR "FsmNew Error line %d st(%ld/%ld) ev(%ld/%ld)\n",
|
|
i, (long)fnlist[i].state, (long)fsm->state_count,
|
|
(long)fnlist[i].event, (long)fsm->event_count);
|
|
} else
|
|
fsm->jumpmatrix[fsm->state_count * fnlist[i].event +
|
|
fnlist[i].state] = (FSMFNPTR)fnlist[i].routine;
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
FsmFree(struct Fsm *fsm)
|
|
{
|
|
kfree((void *) fsm->jumpmatrix);
|
|
}
|
|
|
|
int
|
|
FsmEvent(struct FsmInst *fi, int event, void *arg)
|
|
{
|
|
FSMFNPTR r;
|
|
|
|
if ((fi->state >= fi->fsm->state_count) || (event >= fi->fsm->event_count)) {
|
|
printk(KERN_ERR "FsmEvent Error st(%ld/%ld) ev(%d/%ld)\n",
|
|
(long)fi->state, (long)fi->fsm->state_count, event, (long)fi->fsm->event_count);
|
|
return (1);
|
|
}
|
|
r = fi->fsm->jumpmatrix[fi->fsm->state_count * event + fi->state];
|
|
if (r) {
|
|
if (fi->debug)
|
|
fi->printdebug(fi, "State %s Event %s",
|
|
fi->fsm->strState[fi->state],
|
|
fi->fsm->strEvent[event]);
|
|
r(fi, event, arg);
|
|
return (0);
|
|
} else {
|
|
if (fi->debug)
|
|
fi->printdebug(fi, "State %s Event %s no routine",
|
|
fi->fsm->strState[fi->state],
|
|
fi->fsm->strEvent[event]);
|
|
return (!0);
|
|
}
|
|
}
|
|
|
|
void
|
|
FsmChangeState(struct FsmInst *fi, int newstate)
|
|
{
|
|
fi->state = newstate;
|
|
if (fi->debug)
|
|
fi->printdebug(fi, "ChangeState %s",
|
|
fi->fsm->strState[newstate]);
|
|
}
|
|
|
|
static void
|
|
FsmExpireTimer(struct timer_list *t)
|
|
{
|
|
struct FsmTimer *ft = from_timer(ft, t, tl);
|
|
#if FSM_TIMER_DEBUG
|
|
if (ft->fi->debug)
|
|
ft->fi->printdebug(ft->fi, "FsmExpireTimer %lx", (long) ft);
|
|
#endif
|
|
FsmEvent(ft->fi, ft->event, ft->arg);
|
|
}
|
|
|
|
void
|
|
FsmInitTimer(struct FsmInst *fi, struct FsmTimer *ft)
|
|
{
|
|
ft->fi = fi;
|
|
#if FSM_TIMER_DEBUG
|
|
if (ft->fi->debug)
|
|
ft->fi->printdebug(ft->fi, "FsmInitTimer %lx", (long) ft);
|
|
#endif
|
|
timer_setup(&ft->tl, FsmExpireTimer, 0);
|
|
}
|
|
|
|
void
|
|
FsmDelTimer(struct FsmTimer *ft, int where)
|
|
{
|
|
#if FSM_TIMER_DEBUG
|
|
if (ft->fi->debug)
|
|
ft->fi->printdebug(ft->fi, "FsmDelTimer %lx %d", (long) ft, where);
|
|
#endif
|
|
del_timer(&ft->tl);
|
|
}
|
|
|
|
int
|
|
FsmAddTimer(struct FsmTimer *ft,
|
|
int millisec, int event, void *arg, int where)
|
|
{
|
|
|
|
#if FSM_TIMER_DEBUG
|
|
if (ft->fi->debug)
|
|
ft->fi->printdebug(ft->fi, "FsmAddTimer %lx %d %d",
|
|
(long) ft, millisec, where);
|
|
#endif
|
|
|
|
if (timer_pending(&ft->tl)) {
|
|
printk(KERN_WARNING "FsmAddTimer: timer already active!\n");
|
|
ft->fi->printdebug(ft->fi, "FsmAddTimer already active!");
|
|
return -1;
|
|
}
|
|
ft->event = event;
|
|
ft->arg = arg;
|
|
ft->tl.expires = jiffies + (millisec * HZ) / 1000;
|
|
add_timer(&ft->tl);
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
FsmRestartTimer(struct FsmTimer *ft,
|
|
int millisec, int event, void *arg, int where)
|
|
{
|
|
|
|
#if FSM_TIMER_DEBUG
|
|
if (ft->fi->debug)
|
|
ft->fi->printdebug(ft->fi, "FsmRestartTimer %lx %d %d",
|
|
(long) ft, millisec, where);
|
|
#endif
|
|
|
|
if (timer_pending(&ft->tl))
|
|
del_timer(&ft->tl);
|
|
ft->event = event;
|
|
ft->arg = arg;
|
|
ft->tl.expires = jiffies + (millisec * HZ) / 1000;
|
|
add_timer(&ft->tl);
|
|
}
|