[RAMEN9610-20741]UPSTREAM: xfrm: fix XFRMA_OUTPUT_MARK policy entry
authorMichal Kubecek <mkubecek@suse.cz>
Wed, 29 Nov 2017 17:23:56 +0000 (18:23 +0100)
committerrobot <robot@samsung.com>
Sun, 27 Oct 2019 17:53:31 +0000 (02:53 +0900)
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 <mkubecek@suse.cz>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
(cherry picked from commit e719135881f00c01ca400abb8a5dadaf297a24f9)
Signed-off-by: Benedict Wong <benedictwong@google.com>
Bug: 113046120
Change-Id: I4c1a8de03febfa246b99c7eb67d77f74a1e3ba93

net/xfrm/xfrm_user.c

index 2dee3fca0e5a3c8924e3cd07ad142a1f022fa08b..46f8bba65f9bf8d6fcd5550a10707ef8e7cb8da2 100644 (file)
@@ -2509,7 +2509,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]     = { .len = NLA_U32 },
+       [XFRMA_OUTPUT_MARK]     = { .type = NLA_U32 },
 };
 
 static const struct nla_policy xfrma_spd_policy[XFRMA_SPD_MAX+1] = {