2010-11-08 22:27:26

by Mariusz Kozlowski

[permalink] [raw]
Subject: [PATCH] Fix header size check for GSO case in recvmsg (af_packet)

Parameter 'len' is size_t type so it will never get negative.

Signed-off-by: Mariusz Kozlowski <[email protected]>
---
net/packet/af_packet.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 3616f27..3451191 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1610,9 +1610,11 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,

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);

--
1.7.0.4


2010-11-10 20:52:59

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] Fix header size check for GSO case in recvmsg (af_packet)

From: Mariusz Kozlowski <[email protected]>
Date: Mon, 8 Nov 2010 22:58:45 +0100

> Parameter 'len' is size_t type so it will never get negative.
>
> Signed-off-by: Mariusz Kozlowski <[email protected]>

Applied, thank you!