| Message ID | 20210519141614.3040055-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] ieee802154: fix error return code in ieee802154_llsec_getparams() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 11 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
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
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, ¶ms.out_key)) > + ieee802154_llsec_fill_key_id(msg, ¶ms.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 --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, ¶ms.out_key)) + ieee802154_llsec_fill_key_id(msg, ¶ms.out_key)) { + rc = -ENOBUFS; goto out_free; + } dev_put(dev);
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(-)