| From | Andi Kleen <> | Subject | [PATCH] [73/139] net: Fix header size check for GSO case in recvmsg (af_packet) | Date | Tue, 1 Feb 2011 16:44:30 -0800 (PST) |
| |
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Mariusz Kozlowski <mk@lab.zgora.pl>
[ Upstream commit 1f18b7176e2e41fada24584ce3c80e9abfaca52b]
Parameter 'len' is size_t type so it will never get negative.
Signed-off-by: Mariusz Kozlowski <mk@lab.zgora.pl> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com>
--- net/packet/af_packet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Index: linux-2.6.35.y/net/packet/af_packet.c =================================================================== --- linux-2.6.35.y.orig/net/packet/af_packet.c +++ linux-2.6.35.y/net/packet/af_packet.c @@ -1595,9 +1595,11 @@ static int packet_recvmsg(struct kiocb * err = -EINVAL; vnet_hdr_len = sizeof(vnet_hdr); - if ((len -= vnet_hdr_len) < 0) + if (len < vnet_hdr_len) goto out_free; + len -= vnet_hdr_len; + if (skb_is_gso(skb)) { struct skb_shared_info *sinfo = skb_shinfo(skb);
|