Commit 4b1a5e3c authored Mar 23, 2018 by Sean Tranchetti

net: xfrm: remove duplicate output_mark



Running Google's Android Tests failed due to the output_mark
attribute appearing twice in netlink messages. This change removes
the duplicate nla_put_u32() call that seems to have entered the
code during a merge conflict.

Change-Id: I8c87c8f4ae7ca91c11853f9f149d18c339fd8377
CRs-Fixed: 2212156
Signed-off-by: Sean Tranchetti <stranche@codeaurora.org>

parent 3afabc36

net/xfrm/xfrm_user.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -872,11 +872,6 @@ static int copy_to_user_state_extra(struct xfrm_state *x,
		&x->replay);
		if (ret)
		goto out;
		if (x->props.output_mark) {
		ret = nla_put_u32(skb, XFRMA_OUTPUT_MARK, x->props.output_mark);
		if (ret)
		goto out;
		}
		if (x->security)
		ret = copy_sec_ctx(x->security, skb);
		if (x->props.output_mark) {