Commit 2aeb0b88 authored by Wang Chen's avatar Wang Chen Committed by David S. Miller

af_packet: Check return of dev_set_promiscuity/allmulti

dev_set_promiscuity/allmulti might overflow.  Commit: "netdevice: Fix
promiscuity and allmulti overflow" in net-next makes
dev_set_promiscuity/allmulti return error number if overflow happened.

In af_packet, we check all positive increment for promiscuity and
allmulti to get error return.
Signed-off-by: default avatarWang Chen <wangchen@cn.fujitsu.com>
Acked-by: Patrick McHardy <kaber@trash.net> 
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc943b12
...@@ -1173,7 +1173,8 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -1173,7 +1173,8 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr,
return 0; return 0;
} }
static void packet_dev_mc(struct net_device *dev, struct packet_mclist *i, int what) static int packet_dev_mc(struct net_device *dev, struct packet_mclist *i,
int what)
{ {
switch (i->type) { switch (i->type) {
case PACKET_MR_MULTICAST: case PACKET_MR_MULTICAST:
...@@ -1183,13 +1184,14 @@ static void packet_dev_mc(struct net_device *dev, struct packet_mclist *i, int w ...@@ -1183,13 +1184,14 @@ static void packet_dev_mc(struct net_device *dev, struct packet_mclist *i, int w
dev_mc_delete(dev, i->addr, i->alen, 0); dev_mc_delete(dev, i->addr, i->alen, 0);
break; break;
case PACKET_MR_PROMISC: case PACKET_MR_PROMISC:
dev_set_promiscuity(dev, what); return dev_set_promiscuity(dev, what);
break; break;
case PACKET_MR_ALLMULTI: case PACKET_MR_ALLMULTI:
dev_set_allmulti(dev, what); return dev_set_allmulti(dev, what);
break; break;
default:; default:;
} }
return 0;
} }
static void packet_dev_mclist(struct net_device *dev, struct packet_mclist *i, int what) static void packet_dev_mclist(struct net_device *dev, struct packet_mclist *i, int what)
...@@ -1243,7 +1245,11 @@ static int packet_mc_add(struct sock *sk, struct packet_mreq_max *mreq) ...@@ -1243,7 +1245,11 @@ static int packet_mc_add(struct sock *sk, struct packet_mreq_max *mreq)
i->count = 1; i->count = 1;
i->next = po->mclist; i->next = po->mclist;
po->mclist = i; po->mclist = i;
packet_dev_mc(dev, i, +1); err = packet_dev_mc(dev, i, 1);
if (err) {
po->mclist = i->next;
kfree(i);
}
done: done:
rtnl_unlock(); rtnl_unlock();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment