openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

af_ieee802154: minor cleanup in dgram_bind 

1) fix ro->bound protection by socket lock
2) make ro->bound bit instead of int

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dmitry Baryshkov 2009-08-07 02:58:42 +00:00 committed by David S. Miller
parent 8e753dd0a8
commit 74eda55db4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/ieee802154/dgram.c
View File

@ -40,9 +40,10 @@ static DEFINE_RWLOCK(dgram_lock);
struct dgram_sock { struct dgram_sock {
struct sock sk; struct sock sk;
int bound;
struct ieee802154_addr src_addr; struct ieee802154_addr src_addr;
struct ieee802154_addr dst_addr; struct ieee802154_addr dst_addr;
unsigned bound:1;
}; };
static inline struct dgram_sock *dgram_sk(const struct sock *sk) static inline struct dgram_sock *dgram_sk(const struct sock *sk)
@ -86,18 +87,18 @@ static int dgram_bind(struct sock *sk, struct sockaddr *uaddr, int len)
{ {
struct sockaddr_ieee802154 *addr = (struct sockaddr_ieee802154 *)uaddr; struct sockaddr_ieee802154 *addr = (struct sockaddr_ieee802154 *)uaddr;
struct dgram_sock *ro = dgram_sk(sk); struct dgram_sock *ro = dgram_sk(sk);
int err = 0; int err = -EINVAL;
struct net_device *dev; struct net_device *dev;
lock_sock(sk);
ro->bound = 0; ro->bound = 0;
if (len < sizeof(*addr)) if (len < sizeof(*addr))
return -EINVAL; goto out;
if (addr->family != AF_IEEE802154) if (addr->family != AF_IEEE802154)
return -EINVAL; goto out;
lock_sock(sk);
dev = ieee802154_get_dev(sock_net(sk), &addr->addr); dev = ieee802154_get_dev(sock_net(sk), &addr->addr);
if (!dev) { if (!dev) {
@ -113,6 +114,7 @@ static int dgram_bind(struct sock *sk, struct sockaddr *uaddr, int len)
memcpy(&ro->src_addr, &addr->addr, sizeof(struct ieee802154_addr)); memcpy(&ro->src_addr, &addr->addr, sizeof(struct ieee802154_addr));
ro->bound = 1; ro->bound = 1;
err = 0;
out_put: out_put:
dev_put(dev); dev_put(dev);
out: out: