diff mbox series

[net-next] ieee802154: fix error return code in ieee802154_llsec_getparams()

Message ID 20210519141614.3040055-1-weiyongjun1@huawei.com (mailing list archive)
State Accepted
Headers show
Series [net-next] ieee802154: fix error return code in ieee802154_llsec_getparams() | expand

Commit Message

Wei Yongjun May 19, 2021, 2:16 p.m. UTC 
Fix to return negative error code -ENOBUFS from the error handling
case instead of 0, as done elsewhere in this function.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 net/ieee802154/nl-mac.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Dan Carpenter May 20, 2021, 5:44 a.m. UTC | #1 
On Wed, May 19, 2021 at 02:16:14PM +0000, Wei Yongjun wrote:
> Fix to return negative error code -ENOBUFS from the error handling
> case instead of 0, as done elsewhere in this function.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>

Fixes: 3e9c156e2c21 ("ieee802154: add netlink interfaces for llsec")

This patch doesn't seem to affect runtime so far as I can tell with
a quick glance...

regards,
dan carpenter
Stefan Schmidt June 3, 2021, 9:01 a.m. UTC | #2 
Hello.

On 19.05.21 16:16, Wei Yongjun wrote:
> Fix to return negative error code -ENOBUFS from the error handling
> case instead of 0, as done elsewhere in this function.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
>   net/ieee802154/nl-mac.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
> index 0c1b0770c59e..c23c152860b7 100644
> --- a/net/ieee802154/nl-mac.c
> +++ b/net/ieee802154/nl-mac.c
> @@ -680,8 +680,10 @@ int ieee802154_llsec_getparams(struct sk_buff *skb, struct genl_info *info)
>   	    nla_put_u8(msg, IEEE802154_ATTR_LLSEC_SECLEVEL, params.out_level) ||
>   	    nla_put_u32(msg, IEEE802154_ATTR_LLSEC_FRAME_COUNTER,
>   			be32_to_cpu(params.frame_counter)) ||
> -	    ieee802154_llsec_fill_key_id(msg, &params.out_key))
> +	    ieee802154_llsec_fill_key_id(msg, &params.out_key)) {
> +		rc = -ENOBUFS;
>   		goto out_free;
> +	}
>   
>   	dev_put(dev);


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

Patch

diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index 0c1b0770c59e..c23c152860b7 100644
--- a/net/ieee802154/nl-mac.c
+++ b/net/ieee802154/nl-mac.c
@@ -680,8 +680,10 @@  int ieee802154_llsec_getparams(struct sk_buff *skb, struct genl_info *info)
 	    nla_put_u8(msg, IEEE802154_ATTR_LLSEC_SECLEVEL, params.out_level) ||
 	    nla_put_u32(msg, IEEE802154_ATTR_LLSEC_FRAME_COUNTER,
 			be32_to_cpu(params.frame_counter)) ||
-	    ieee802154_llsec_fill_key_id(msg, &params.out_key))
+	    ieee802154_llsec_fill_key_id(msg, &params.out_key)) {
+		rc = -ENOBUFS;
 		goto out_free;
+	}
 
 	dev_put(dev);