Skip to contentSkip to conversation

net: ieee802154: return -EINVAL for unknown addr type

PATCH Applied Alexander Aring 3 participants 3 messages Oct 6, 2022 – Oct 7, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: ieee802154: return -EINVAL for unknown addr type

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 94160108a70c ("net/ieee802154: fix uninit value bug in dgram_sendmsg")
---
 include/net/ieee802154_netdev.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
include/net/ieee802154_netdev.h +9 -3
index a8994f307fc3..03b64bf876a4 100644
@@ -185,21 +185,27 @@ static inline int
 ieee802154_sockaddr_check_size(struct sockaddr_ieee802154 *daddr, int len)
 {
 	struct ieee802154_addr_sa *sa;
+	int ret = 0;
 
 	sa = &daddr->addr;
 	if (len < IEEE802154_MIN_NAMELEN)
 		return -EINVAL;
 	switch (sa->addr_type) {
+	case IEEE802154_ADDR_NONE:
+		break;
 	case IEEE802154_ADDR_SHORT:
 		if (len < IEEE802154_NAMELEN_SHORT)
-			return -EINVAL;
+			ret = -EINVAL;
 		break;
 	case IEEE802154_ADDR_LONG:
 		if (len < IEEE802154_NAMELEN_LONG)
-			return -EINVAL;
+			ret = -EINVAL;
+		break;
+	default:
+		ret = -EINVAL;
 		break;
 	}
-	return 0;
+	return ret;
 }
 
 static inline void ieee802154_addr_from_sa(struct ieee802154_addr *a,
Signature · 1 line
2.31.1
maintainer
#1 lore raw

Hello.

Quoted 35 lines · Alexander Aring

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 94160108a70c ("net/ieee802154: fix uninit value bug in dgram_sendmsg")
---
  include/net/ieee802154_netdev.h | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
include/net/ieee802154_netdev.h +5 -2
index a8994f307fc3..03b64bf876a4 100644
@@ -185,21 +185,27 @@ static inline int
  ieee802154_sockaddr_check_size(struct sockaddr_ieee802154 *daddr, int len)
  {
  	struct ieee802154_addr_sa *sa;
+	int ret = 0;
 
  	sa = &daddr->addr;
  	if (len < IEEE802154_MIN_NAMELEN)
  		return -EINVAL;
  	switch (sa->addr_type) {
+	case IEEE802154_ADDR_NONE:
+		break;
  	case IEEE802154_ADDR_SHORT:
  		if (len < IEEE802154_NAMELEN_SHORT)
-			return -EINVAL;
+			ret = -EINVAL;
  		break;
  	case IEEE802154_ADDR_LONG:
  		if (len < IEEE802154_NAMELEN_LONG)
-			return -EINVAL;
+			ret = -EINVAL;

include/net/ieee802154_netdev.h static inline int · line 211

Quoted 10 lines
include/net/ieee802154_netdev.h +4 -1
+		break;
+	default:
+		ret = -EINVAL;
  		break;
  	}
-	return 0;
+	return ret;
  }
 
  static inline void ieee802154_addr_from_sa(struct ieee802154_addr *a,

This patch has been applied to the wpan tree and will be part of the next pull request to net. Thanks!

regards
Stefan Schmidt

#2 lore raw
In reply to Alexander Aring
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:

Quoted 8 lines · On Wed, 5 Oct 2022 22:02:37 -0400 you wrote:

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 94160108a70c ("net/ieee802154: fix uninit value bug in dgram_sendmsg")

[...]

Here is the summary with links:
- [net,OR,wpan] net: ieee802154: return -EINVAL for unknown addr type

    https://git.kernel.org/netdev/net/c/30393181fdbc

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html