Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

af_packet: move strict addr_len check right before dev_[mc/unicast]_[add/del]

Browse source 
My previous patch 914c8ad2d1 incorrectly changed
the length check in packet_mc_add to be more strict. The problem is that
userspace is not filling this field (and it stays zeroed) in case of setting
PACKET_MR_PROMISC or PACKET_MR_ALLMULTI. So move the strict check to the point
in path where the addr_len must be set correctly.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Reported-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2010-03-02 20:40:01 +00:00 committed by David S. Miller
parent 9fe969345b
commit 1162563f82
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/packet/af_packet.c
View file

@ -1688,6 +1688,8 @@ static int packet_dev_mc(struct net_device *dev, struct packet_mclist *i,
{ {
switch (i->type) { switch (i->type) {
case PACKET_MR_MULTICAST: case PACKET_MR_MULTICAST:
if (i->alen != dev->addr_len)
return -EINVAL;
if (what > 0) if (what > 0)
return dev_mc_add(dev, i->addr, i->alen, 0); return dev_mc_add(dev, i->addr, i->alen, 0);
else else
@ -1700,6 +1702,8 @@ static int packet_dev_mc(struct net_device *dev, struct packet_mclist *i,
return dev_set_allmulti(dev, what); return dev_set_allmulti(dev, what);
break; break;
case PACKET_MR_UNICAST: case PACKET_MR_UNICAST:
if (i->alen != dev->addr_len)
return -EINVAL;
if (what > 0) if (what > 0)
return dev_unicast_add(dev, i->addr); return dev_unicast_add(dev, i->addr);
else else
@ -1734,7 +1738,7 @@ static int packet_mc_add(struct sock *sk, struct packet_mreq_max *mreq)
goto done; goto done;
err = -EINVAL; err = -EINVAL;
if (mreq->mr_alen != dev->addr_len) if (mreq->mr_alen > dev->addr_len)
goto done; goto done;
err = -ENOBUFS; err = -ENOBUFS;