packet: Do not leak dev refcounts on error exit (d972f3dc) · Commits · 戴 / test

'dev' is non NULL when the addr_len check triggers so it must goto a label that does the dev_put otherwise dev will have a leaked refcount. This bug causes the ib_ipoib module to become unloadable when using systemd-network as it triggers this check on InfiniBand links. Fixes: ("packet: validate address length") Reported-by:

Leon Romanovsky <leonro@mellanox.com> Signed-off-by:

Jason Gunthorpe <jgg@mellanox.com> Acked-by:

Willem de Bruijn <willemb@google.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/packet/af_packet.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2628,7 +2628,7 @@ static int tpacket_snd(struct packet_sock po, struct msghdr msg)
	addr = saddr->sll_halen ? saddr->sll_addr : NULL;		addr = saddr->sll_halen ? saddr->sll_addr : NULL;
	dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex);		dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex);
	if (addr && dev && saddr->sll_halen < dev->addr_len)		if (addr && dev && saddr->sll_halen < dev->addr_len)
	goto out;		goto out_put;
	}		}

	err = -ENXIO;		err = -ENXIO;
	@@ -2828,7 +2828,7 @@ static int packet_snd(struct socket sock, struct msghdr msg, size_t len)
	addr = saddr->sll_halen ? saddr->sll_addr : NULL;		addr = saddr->sll_halen ? saddr->sll_addr : NULL;
	dev = dev_get_by_index(sock_net(sk), saddr->sll_ifindex);		dev = dev_get_by_index(sock_net(sk), saddr->sll_ifindex);
	if (addr && dev && saddr->sll_halen < dev->addr_len)		if (addr && dev && saddr->sll_halen < dev->addr_len)
	goto out;		goto out_unlock;
	}		}

	err = -ENXIO;		err = -ENXIO;

Admin message