Commit 46d2cfb1 authored Jan 11, 2015 by Christoph Jaeger Committed by David S. Miller Jan 11, 2015

packet: bail out of packet_snd() if L2 header creation fails



Due to a misplaced parenthesis, the expression

  (unlikely(offset) < 0),

which expands to

  (__builtin_expect(!!(offset), 0) < 0),

never evaluates to true. Therefore, when sending packets with
PF_PACKET/SOCK_DGRAM, packet_snd() does not abort as intended
if the creation of the layer 2 header fails.

Spotted by Coverity - CID 1259975 ("Operands don't affect result").

Fixes: 9c707762 ("packet: make packet_snd fail on len smaller than l2 header")
Signed-off-by: Christoph Jaeger <cj@linux.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Acked-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7a05dc64

net/packet/af_packet.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2517,7 +2517,7 @@ static int packet_snd(struct socket sock, struct msghdr msg, size_t len)
		err = -EINVAL;
		if (sock->type == SOCK_DGRAM) {
		offset = dev_hard_header(skb, dev, ntohs(proto), addr, NULL, len);
		if (unlikely(offset) < 0)
		if (unlikely(offset < 0))
		goto out_free;
		} else {
		if (ll_header_truncated(dev, len))

Admin message