diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-02-04 02:13:57 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-02-04 23:51:19 -0800 |
| commit | ad2ad0f96546d6d56b2665bcc863c33ae57c49c4 (patch) | |
| tree | 9c5f6357bd7a0ecb4748acfaf19a04ea3149707b /net/bridge | |
| parent | c2db292438c20c3f13db6e5563e0ce5b449bedac (diff) | |
| download | kernel_samsung_espresso10-ad2ad0f96546d6d56b2665bcc863c33ae57c49c4.zip kernel_samsung_espresso10-ad2ad0f96546d6d56b2665bcc863c33ae57c49c4.tar.gz kernel_samsung_espresso10-ad2ad0f96546d6d56b2665bcc863c33ae57c49c4.tar.bz2 | |
[NETFILTER]: Fix undersized skb allocation in ipt_ULOG/ebt_ulog/nfnetlink_log
The skb allocated is always of size nlbufsize, even if that is smaller than
the size needed for the current packet.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/netfilter/ebt_ulog.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index dbbf9f6..802baf7 100644 --- a/net/bridge/netfilter/ebt_ulog.c +++ b/net/bridge/netfilter/ebt_ulog.c @@ -98,12 +98,14 @@ static void ulog_timer(unsigned long data) static struct sk_buff *ulog_alloc_skb(unsigned int size) { struct sk_buff *skb; + unsigned int n; - skb = alloc_skb(nlbufsiz, GFP_ATOMIC); + n = max(size, nlbufsiz); + skb = alloc_skb(n, GFP_ATOMIC); if (!skb) { PRINTR(KERN_ERR "ebt_ulog: can't alloc whole buffer " - "of size %ub!\n", nlbufsiz); - if (size < nlbufsiz) { + "of size %ub!\n", n); + if (n > size) { /* try to allocate only as much as we need for * current packet */ skb = alloc_skb(size, GFP_ATOMIC); |