From: Michal Kubecek Date: Wed, 29 Nov 2017 17:23:56 +0000 (+0100) Subject: UPSTREAM: xfrm: fix XFRMA_OUTPUT_MARK policy entry X-Git-Tag: MMI-QSB30.62-17~73 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=feca963333d4ecd2db2bf303ebb469f2f0e763c3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git UPSTREAM: xfrm: fix XFRMA_OUTPUT_MARK policy entry This seems to be an obvious typo, NLA_U32 is type of the attribute, not its (minimal) length. Fixes: 077fbac405bf ("net: xfrm: support setting an output mark.") Signed-off-by: Michal Kubecek Signed-off-by: Steffen Klassert (cherry picked from commit e719135881f00c01ca400abb8a5dadaf297a24f9) Signed-off-by: Benedict Wong Bug: 113046120 Change-Id: I4c1a8de03febfa246b99c7eb67d77f74a1e3ba93 --- diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index e989b2bbbd67..824f3a9fe5b7 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -2563,6 +2563,7 @@ static const struct nla_policy xfrma_policy[XFRMA_MAX+1] = { [XFRMA_PROTO] = { .type = NLA_U8 }, [XFRMA_ADDRESS_FILTER] = { .len = sizeof(struct xfrm_address_filter) }, [XFRMA_OFFLOAD_DEV] = { .len = sizeof(struct xfrm_user_offload) }, + [XFRMA_OUTPUT_MARK] = { .type = NLA_U32 }, [XFRMA_SET_MARK] = { .type = NLA_U32 }, [XFRMA_SET_MARK_MASK] = { .type = NLA_U32 }, [XFRMA_IF_ID] = { .type = NLA_U32 },