net: ieee802154: return -EINVAL for unknown addr type

commit 30393181fd 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: 94160108a7 ("net/ieee802154: fix uninit value bug in dgram_sendmsg")
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Aring 2022-10-05 22:02:37 -04:00 коммит произвёл Greg Kroah-Hartman
Родитель 0db2efb3bf
Коммит b8989e95d7
1 изменённых файлов: 9 добавлений и 3 удалений

Просмотреть файл

@ -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,