]> git.hungrycats.org Git - linux/commit
NETFILTER: nfnetlink_queue: fix SKB_LINEAR_ASSERT when mangling packet data
authorPatrick McHardy <kaber@trash.net>
Mon, 25 Feb 2008 14:01:01 +0000 (15:01 +0100)
committerChris Wright <chrisw@sous-sol.org>
Mon, 24 Mar 2008 18:47:22 +0000 (11:47 -0700)
commitca02fcbe2193c3947466f5659fc7ac7b851ea20b
tree1e001172e1359a97853f73e1fc60fa0bdfefd113
parentd8d644bcd0e46dc2a354ffce219a788630a0cdcc
NETFILTER: nfnetlink_queue: fix SKB_LINEAR_ASSERT when mangling packet data

Upstream commit e2b58a67:

As reported by Tomas Simonaitis <tomas.simonaitis@gmail.com>, inserting new
data in skbs queued over {ip,ip6,nfnetlink}_queue triggers a SKB_LINEAR_ASSERT
in skb_put().

Going back through the git history, it seems this bug is present since at
least 2.6.12-rc2, probably even since the removal of skb_linearize() for
netfilter.

Linearize non-linear skbs through skb_copy_expand() when enlarging them.
Tested by Thomas, fixes bugzilla #9933.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/ipv4/netfilter/ip_queue.c
net/ipv6/netfilter/ip6_queue.c
net/netfilter/nfnetlink_queue.c