Unverified Commit 2d5e6fcd authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11278 net/sched: act_mpls: Fix warning during failed attribute validation 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yue Haibing <yuehaibing@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HBBPJE563CZP6OTVV3QATIL3U6B2HZBT/ 
 
https://gitee.com/openeuler/kernel/issues/IALLFF 
 
Link:https://gitee.com/openeuler/kernel/pulls/11278

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents de83c0ca ffe4c632

net/sched/act_mpls.c

+7 −1
Original line number Diff line number Diff line
@@ -133,6 +133,11 @@ static int valid_label(const struct nlattr *attr, 
{

	const u32 *label = nla_data(attr);



	if (nla_len(attr) != sizeof(*label)) {

		NL_SET_ERR_MSG_MOD(extack, "Invalid MPLS label length");

		return -EINVAL;

	}



	if (*label & ~MPLS_LABEL_MASK || *label == MPLS_LABEL_IMPLNULL) {

		NL_SET_ERR_MSG_MOD(extack, "MPLS label out of range");

		return -EINVAL;
@@ -144,7 +149,8 @@ static int valid_label(const struct nlattr *attr, 
static const struct nla_policy mpls_policy[TCA_MPLS_MAX + 1] = {

	[TCA_MPLS_PARMS]	= NLA_POLICY_EXACT_LEN(sizeof(struct tc_mpls)),

	[TCA_MPLS_PROTO]	= { .type = NLA_U16 },

	[TCA_MPLS_LABEL]	= NLA_POLICY_VALIDATE_FN(NLA_U32, valid_label),

	[TCA_MPLS_LABEL]	= NLA_POLICY_VALIDATE_FN(NLA_BINARY,

							 valid_label),

	[TCA_MPLS_TC]		= NLA_POLICY_RANGE(NLA_U8, 0, 7),

	[TCA_MPLS_TTL]		= NLA_POLICY_MIN(NLA_U8, 1),

	[TCA_MPLS_BOS]		= NLA_POLICY_RANGE(NLA_U8, 0, 1),