diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-03-24 22:13:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-03-25 18:48:11 -0700 |
| commit | d3fa76ee6b4a8dd0efda4e78e96f5b19533b3dea (patch) | |
| tree | f960e24f323770fd3f26b0b14107cf3b0c0c0024 /net/sched/cls_basic.c | |
| parent | c93a882ebe673b5e6da0a70fd433f7517e032d23 (diff) | |
| download | olio-linux-3.10-d3fa76ee6b4a8dd0efda4e78e96f5b19533b3dea.tar.xz olio-linux-3.10-d3fa76ee6b4a8dd0efda4e78e96f5b19533b3dea.zip | |
[NET_SCHED]: cls_basic: fix NULL pointer dereference
cls_basic doesn't allocate tp->root before it is linked into the
active classifier list, resulting in a NULL pointer dereference
when packets hit the classifier before its ->change function is
called.
Reported by Chris Madden <chris@reflexsecurity.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_basic.c')
| -rw-r--r-- | net/sched/cls_basic.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c index fad08e521c2..70fe36eb66a 100644 --- a/net/sched/cls_basic.c +++ b/net/sched/cls_basic.c @@ -81,6 +81,13 @@ static void basic_put(struct tcf_proto *tp, unsigned long f) static int basic_init(struct tcf_proto *tp) { + struct basic_head *head; + + head = kzalloc(sizeof(*head), GFP_KERNEL); + if (head == NULL) + return -ENOBUFS; + INIT_LIST_HEAD(&head->flist); + tp->root = head; return 0; } @@ -176,15 +183,6 @@ static int basic_change(struct tcf_proto *tp, unsigned long base, u32 handle, } err = -ENOBUFS; - if (head == NULL) { - head = kzalloc(sizeof(*head), GFP_KERNEL); - if (head == NULL) - goto errout; - - INIT_LIST_HEAD(&head->flist); - tp->root = head; - } - f = kzalloc(sizeof(*f), GFP_KERNEL); if (f == NULL) goto errout; |