ip_queue: Fix wrong skb->len == nlmsg_len assumption
Subsystems (3)
PATCH 1/1 ip_queue: Fix wrong skb->len == nlmsg_len assumption
The size of the skb carrying the netlink message is not equivalent to the length of the actual netlink message due to padding. ip_queue matches the length of the payload against the original packet size to determine if packet mangling is desired, due to the above wrong assumption arbitary packets may not be mangled depening on their original size.
net/ipv4/netfilter/ip_queue.c +1 -1
@@ -524,7 +524,7 @@ ipq_rcv_skb(struct sk_buff *skb)write_unlock_bh (&queue_lock); status =ipq_receive_peer (NLMSG_DATA (nlh), type, - skblen -NLMSG_LENGTH (0 )); + nlmsglen -NLMSG_LENGTH (0 ));if (status <0 )RCV_SKB_FAIL (status);
net/ipv6/netfilter/ip6_queue.c +1 -1
@@ -522,7 +522,7 @@ ipq_rcv_skb(struct sk_buff *skb)write_unlock_bh (&queue_lock); status =ipq_receive_peer (NLMSG_DATA (nlh), type, - skblen -NLMSG_LENGTH (0 )); + nlmsglen -NLMSG_LENGTH (0 ));if (status <0 )RCV_SKB_FAIL (status);
Quoted 7 lines · Thomas Graf
The size of the skb carrying the netlink message is not equivalent to the length of the actual netlink message due to padding.
ip_queuematches the length of the payload against the original packet size to determine if packet mangling is desired, due to the above wrong assumption arbitary packets may not be mangled depening on their original size.
Looks good, thanks Thomas. I think this should also go in 2.4.
From: Patrick McHardy <[email protected]>
Date: Tue, 07 Mar 2006 13:58:53 +0100
Quoted 10 lines
Quoted 7 lines · Thomas Graf
The size of the skb carrying the netlink message is not equivalent to the length of the actual netlink message due to padding.
ip_queuematches the length of the payload against the original packet size to determine if packet mangling is desired, due to the above wrong assumption arbitary packets may not be mangled depening on their original size.Looks good, thanks Thomas. I think this should also go in 2.4.
Pushed to 2.6.16, 2.6.x stable, and 2.4.x.
Phew!
Thanks Thomas.