Unverified Commit 82c827a3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8323 [sync] PR-8219: tipc: Change nla_policy for bearer-related names to NLA_NUL_STRING 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/8219 
 
PR sync from: Huang Xiaojia <huangxiaojia2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JO2OSKIDHD45PMDZDUINMJ26G25HCJKH/ 
*** BLURB HERE ***

Shigeru Yoshida (1):
  tipc: Change nla_policy for bearer-related names to NLA_NUL_STRING


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9RFB7 
 
Link:https://gitee.com/openeuler/kernel/pulls/8323

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 78e4f82c f558302d

net/tipc/netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ const struct nla_policy tipc_nl_net_policy[TIPC_NLA_NET_MAX + 1] = { 


const struct nla_policy tipc_nl_link_policy[TIPC_NLA_LINK_MAX + 1] = {

	[TIPC_NLA_LINK_UNSPEC]		= { .type = NLA_UNSPEC },

	[TIPC_NLA_LINK_NAME]		= { .type = NLA_STRING,

	[TIPC_NLA_LINK_NAME]		= { .type = NLA_NUL_STRING,

					    .len = TIPC_MAX_LINK_NAME },

	[TIPC_NLA_LINK_MTU]		= { .type = NLA_U32 },

	[TIPC_NLA_LINK_BROADCAST]	= { .type = NLA_FLAG },
@@ -125,7 +125,7 @@ const struct nla_policy tipc_nl_prop_policy[TIPC_NLA_PROP_MAX + 1] = { 


const struct nla_policy tipc_nl_bearer_policy[TIPC_NLA_BEARER_MAX + 1]	= {

	[TIPC_NLA_BEARER_UNSPEC]	= { .type = NLA_UNSPEC },

	[TIPC_NLA_BEARER_NAME]		= { .type = NLA_STRING,

	[TIPC_NLA_BEARER_NAME]		= { .type = NLA_NUL_STRING,

					    .len = TIPC_MAX_BEARER_NAME },

	[TIPC_NLA_BEARER_PROP]		= { .type = NLA_NESTED },

	[TIPC_NLA_BEARER_DOMAIN]	= { .type = NLA_U32 }