| Message ID | 20220919160830.1436109-1-weiyongjun@huaweicloud.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | net: ieee802154: fix error return code in dgram_bind() | expand |
Hello. On 19.09.22 18:08, Wei Yongjun wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > Fix to return error code -EINVAL from the error handling > case instead of 0, as done elsewhere in this function. > > Fixes: 94160108a70c ("net/ieee802154: fix uninit value bug in dgram_sendmsg") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > net/ieee802154/socket.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c > index 7889e1ef7fad..35c54dce74f9 100644 > --- a/net/ieee802154/socket.c > +++ b/net/ieee802154/socket.c > @@ -498,8 +498,10 @@ static int dgram_bind(struct sock *sk, struct sockaddr *uaddr, int len) > if (err < 0) > goto out; > > - if (addr->family != AF_IEEE802154) > + if (addr->family != AF_IEEE802154) { > + err = -EINVAL; > goto out; > + } > > ieee802154_addr_from_sa(&haddr, &addr->addr); > dev = ieee802154_get_dev(sock_net(sk), &haddr); > This patch has been applied to the wpan tree and will be part of the next pull request to net. Thanks! regards Stefan Schmidt
diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c index 7889e1ef7fad..35c54dce74f9 100644 --- a/net/ieee802154/socket.c +++ b/net/ieee802154/socket.c @@ -498,8 +498,10 @@ static int dgram_bind(struct sock *sk, struct sockaddr *uaddr, int len) if (err < 0) goto out; - if (addr->family != AF_IEEE802154) + if (addr->family != AF_IEEE802154) { + err = -EINVAL; goto out; + } ieee802154_addr_from_sa(&haddr, &addr->addr); dev = ieee802154_get_dev(sock_net(sk), &haddr);