diff mbox series

[net,OR,wpan] net: ieee802154: return -EINVAL for unknown addr type

Message ID 20221006020237.318511-1-aahringo@redhat.com (mailing list archive)
State Accepted
Headers show
Series [net,OR,wpan] net: ieee802154: return -EINVAL for unknown addr type | expand

Commit Message

Alexander Aring Oct. 6, 2022, 2:02 a.m. UTC
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")
Signed-off-by: Alexander Aring <aahringo@redhat.com>
---
 include/net/ieee802154_netdev.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Stefan Schmidt Oct. 7, 2022, 7:44 a.m. UTC | #1
Hello.

On 06.10.22 04:02, Alexander Aring 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")
> Signed-off-by: Alexander Aring <aahringo@redhat.com>
> ---
>   include/net/ieee802154_netdev.h | 12 +++++++++---
>   1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
> index a8994f307fc3..03b64bf876a4 100644
> --- a/include/net/ieee802154_netdev.h
> +++ b/include/net/ieee802154_netdev.h
> @@ -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,

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

regards
Stefan Schmidt
patchwork-bot+netdevbpf@kernel.org Oct. 7, 2022, 7:50 a.m. UTC | #2
Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:

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")
> Signed-off-by: Alexander Aring <aahringo@redhat.com>
> 
> [...]

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!
diff mbox series

Patch

diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index a8994f307fc3..03b64bf876a4 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -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,