2015-07-28 10:57:35

by Alexander Drozdov

Subject: [PATCH] packet: tpacket_snd(): fix signed/unsigned comparison

tpacket_fill_skb() can return a negative value (-errno) which
is stored in tp_len variable. In that case the following
condition will be (but shouldn't be) true:

tp_len > dev->mtu + dev->hard_header_len

as dev->mtu and dev->hard_header_len are both unsigned.

That may lead to just returning an incorrect EMSGSIZE errno
to the user.

Signed-off-by: Alexander Drozdov <[email protected]>
---
net/packet/af_packet.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index c9e8741..d1d3625 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -2403,7 +2403,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
}
tp_len = tpacket_fill_skb(po, skb, ph, dev, size_max, proto,
addr, hlen);
- if (tp_len > dev->mtu + dev->hard_header_len) {
+ if (likely(tp_len >= 0) &&
+ tp_len > dev->mtu + dev->hard_header_len) {
struct ethhdr *ehdr;
/* Earlier code assumed this would be a VLAN pkt,
* double-check this now that we have the actual
--
1.9.1

2015-07-28 11:07:14

by Daniel Borkmann

Subject: Re: [PATCH] packet: tpacket_snd(): fix signed/unsigned comparison

On 07/28/2015 12:57 PM, Alexander Drozdov wrote:
> tpacket_fill_skb() can return a negative value (-errno) which
> is stored in tp_len variable. In that case the following
> condition will be (but shouldn't be) true:
>
> tp_len > dev->mtu + dev->hard_header_len
>
> as dev->mtu and dev->hard_header_len are both unsigned.
>
> That may lead to just returning an incorrect EMSGSIZE errno
> to the user.
>
> Signed-off-by: Alexander Drozdov <[email protected]>

Looks good to me, thanks!

Acked-by: Daniel Borkmann <[email protected]>

2015-07-28 11:38:11

by Eric Dumazet

Subject: Re: [PATCH] packet: tpacket_snd(): fix signed/unsigned comparison

On Tue, 2015-07-28 at 13:07 +0200, Daniel Borkmann wrote:
> On 07/28/2015 12:57 PM, Alexander Drozdov wrote:
> > tpacket_fill_skb() can return a negative value (-errno) which
> > is stored in tp_len variable. In that case the following
> > condition will be (but shouldn't be) true:
> >
> > tp_len > dev->mtu + dev->hard_header_len
> >
> > as dev->mtu and dev->hard_header_len are both unsigned.
> >
> > That may lead to just returning an incorrect EMSGSIZE errno
> > to the user.
> >
> > Signed-off-by: Alexander Drozdov <[email protected]>
>
> Looks good to me, thanks!
>
> Acked-by: Daniel Borkmann <[email protected]>
> --

Fixes: 52f1454f629fa ("packet: allow to transmit +4 byte in TX_RING slot for VLAN case")

2015-07-29 07:10:39

by David Miller

Subject: Re: [PATCH] packet: tpacket_snd(): fix signed/unsigned comparison

From: Alexander Drozdov <[email protected]>
Date: Tue, 28 Jul 2015 13:57:01 +0300

> tpacket_fill_skb() can return a negative value (-errno) which
> is stored in tp_len variable. In that case the following
> condition will be (but shouldn't be) true:
>
> tp_len > dev->mtu + dev->hard_header_len
>
> as dev->mtu and dev->hard_header_len are both unsigned.
>
> That may lead to just returning an incorrect EMSGSIZE errno
> to the user.
>
> Signed-off-by: Alexander Drozdov <[email protected]>

Applied, thanks.