| Message ID | 20230614080013.1112884-1-linma@zju.edu.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 44194cb1b6045dea33ae9a0d54fb7e7cd93a2e09 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v1] tipc: resize nlattr array to correct size | expand |
>Subject: [PATCH v1] tipc: resize nlattr array to correct size > >According to nla_parse_nested_deprecated(), the tb[] is supposed to the >destination array with maxtype+1 elements. In current >tipc_nl_media_get() and __tipc_nl_media_set(), a larger array is used >which is unnecessary. This patch resize them to a proper size. > >Signed-off-by: Lin Ma <linma@zju.edu.cn> >--- Which branch (net or net-next) do you want to apply this change to ? > net/tipc/bearer.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c >index 53881406e200..cdcd2731860b 100644 >--- a/net/tipc/bearer.c >+++ b/net/tipc/bearer.c >@@ -1258,7 +1258,7 @@ int tipc_nl_media_get(struct sk_buff *skb, struct genl_info *info) > struct tipc_nl_msg msg; > struct tipc_media *media; > struct sk_buff *rep; >- struct nlattr *attrs[TIPC_NLA_BEARER_MAX + 1]; >+ struct nlattr *attrs[TIPC_NLA_MEDIA_MAX + 1]; > > if (!info->attrs[TIPC_NLA_MEDIA]) > return -EINVAL; >@@ -1307,7 +1307,7 @@ int __tipc_nl_media_set(struct sk_buff *skb, struct genl_info *info) > int err; > char *name; > struct tipc_media *m; >- struct nlattr *attrs[TIPC_NLA_BEARER_MAX + 1]; >+ struct nlattr *attrs[TIPC_NLA_MEDIA_MAX + 1]; > > if (!info->attrs[TIPC_NLA_MEDIA]) > return -EINVAL; >-- >2.17.1 >
> > Which branch (net or net-next) do you want to apply this change to ? > I don't really know the difference :D Since this a not any new feature patch but just solving a typo like bug. I guess it can go to (net) branch instead the (net-next) ? Regards Lin > > net/tipc/bearer.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > >diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c > >index 53881406e200..cdcd2731860b 100644 > >--- a/net/tipc/bearer.c > >+++ b/net/tipc/bearer.c > >@@ -1258,7 +1258,7 @@ int tipc_nl_media_get(struct sk_buff *skb, struct genl_info *info) > > struct tipc_nl_msg msg; > > struct tipc_media *media; > > struct sk_buff *rep; > >- struct nlattr *attrs[TIPC_NLA_BEARER_MAX + 1]; > >+ struct nlattr *attrs[TIPC_NLA_MEDIA_MAX + 1]; > > > > if (!info->attrs[TIPC_NLA_MEDIA]) > > return -EINVAL; > >@@ -1307,7 +1307,7 @@ int __tipc_nl_media_set(struct sk_buff *skb, struct genl_info *info) > > int err; > > char *name; > > struct tipc_media *m; > >- struct nlattr *attrs[TIPC_NLA_BEARER_MAX + 1]; > >+ struct nlattr *attrs[TIPC_NLA_MEDIA_MAX + 1]; > > > > if (!info->attrs[TIPC_NLA_MEDIA]) > > return -EINVAL; > >-- > >2.17.1 > >
>I don't really know the difference :D > >Since this a not any new feature patch but just solving a typo like bug. I guess >it can go to (net) branch instead the (net-next) ? > >Regards >Lin > It is OK to go for net. Please: - append "net" to your patch title. - add Fixes tag to the changelog.
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 14 Jun 2023 16:00:13 +0800 you wrote: > According to nla_parse_nested_deprecated(), the tb[] is supposed to the > destination array with maxtype+1 elements. In current > tipc_nl_media_get() and __tipc_nl_media_set(), a larger array is used > which is unnecessary. This patch resize them to a proper size. > > Signed-off-by: Lin Ma <linma@zju.edu.cn> > > [...] Here is the summary with links: - [v1] tipc: resize nlattr array to correct size https://git.kernel.org/netdev/net/c/44194cb1b604 You are awesome, thank you!
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 53881406e200..cdcd2731860b 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c @@ -1258,7 +1258,7 @@ int tipc_nl_media_get(struct sk_buff *skb, struct genl_info *info) struct tipc_nl_msg msg; struct tipc_media *media; struct sk_buff *rep; - struct nlattr *attrs[TIPC_NLA_BEARER_MAX + 1]; + struct nlattr *attrs[TIPC_NLA_MEDIA_MAX + 1]; if (!info->attrs[TIPC_NLA_MEDIA]) return -EINVAL; @@ -1307,7 +1307,7 @@ int __tipc_nl_media_set(struct sk_buff *skb, struct genl_info *info) int err; char *name; struct tipc_media *m; - struct nlattr *attrs[TIPC_NLA_BEARER_MAX + 1]; + struct nlattr *attrs[TIPC_NLA_MEDIA_MAX + 1]; if (!info->attrs[TIPC_NLA_MEDIA]) return -EINVAL;
According to nla_parse_nested_deprecated(), the tb[] is supposed to the destination array with maxtype+1 elements. In current tipc_nl_media_get() and __tipc_nl_media_set(), a larger array is used which is unnecessary. This patch resize them to a proper size. Signed-off-by: Lin Ma <linma@zju.edu.cn> --- net/tipc/bearer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)