提交 93db290a 编写于 作者: A Alexander Aring 提交者: Jialin Zhang

net: ieee802154: return -EINVAL for unknown addr type

stable inclusion
from stable-v5.10.150
commit dc54ff9fc4a4886f4cd409054c6505ca352a146a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6D0XA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=dc54ff9fc4a4886f4cd409054c6505ca352a146a

--------------------------------

commit 30393181 upstream.

This patch adds handling to return -EINVAL for an unknown addr type. The
current behaviour is to return 0 as successful but the size of an
unknown addr type is not defined and should return an error like -EINVAL.

Fixes: 94160108 ("net/ieee802154: fix uninit value bug in dgram_sendmsg")
Signed-off-by: NAlexander Aring <aahringo@redhat.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NJialin Zhang <zhangjialin11@huawei.com>
上级 79fea65d
...@@ -185,21 +185,27 @@ static inline int ...@@ -185,21 +185,27 @@ static inline int
ieee802154_sockaddr_check_size(struct sockaddr_ieee802154 *daddr, int len) ieee802154_sockaddr_check_size(struct sockaddr_ieee802154 *daddr, int len)
{ {
struct ieee802154_addr_sa *sa; struct ieee802154_addr_sa *sa;
int ret = 0;
sa = &daddr->addr; sa = &daddr->addr;
if (len < IEEE802154_MIN_NAMELEN) if (len < IEEE802154_MIN_NAMELEN)
return -EINVAL; return -EINVAL;
switch (sa->addr_type) { switch (sa->addr_type) {
case IEEE802154_ADDR_NONE:
break;
case IEEE802154_ADDR_SHORT: case IEEE802154_ADDR_SHORT:
if (len < IEEE802154_NAMELEN_SHORT) if (len < IEEE802154_NAMELEN_SHORT)
return -EINVAL; ret = -EINVAL;
break; break;
case IEEE802154_ADDR_LONG: case IEEE802154_ADDR_LONG:
if (len < IEEE802154_NAMELEN_LONG) if (len < IEEE802154_NAMELEN_LONG)
return -EINVAL; ret = -EINVAL;
break;
default:
ret = -EINVAL;
break; break;
} }
return 0; return ret;
} }
static inline void ieee802154_addr_from_sa(struct ieee802154_addr *a, static inline void ieee802154_addr_from_sa(struct ieee802154_addr *a,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册