All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	Steffen Klassert <steffen.klassert@secunet.com>,
	<netdev@vger.kernel.org>
Subject: [PATCH 4/8] xfrm: clone XFRMA_SET_MARK in xfrm_do_migrate
Date: Mon, 28 Sep 2020 10:24:46 +0200	[thread overview]
Message-ID: <20200928082450.29414-5-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20200928082450.29414-1-steffen.klassert@secunet.com>

From: Antony Antony <antony.antony@secunet.com>

XFRMA_SET_MARK and XFRMA_SET_MARK_MASK was not cloned from the old
to the new. Migrate these two attributes during XFRMA_MSG_MIGRATE

Fixes: 9b42c1f179a6 ("xfrm: Extend the output_mark to support input direction and masking.")
Signed-off-by: Antony Antony <antony.antony@secunet.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
 net/xfrm/xfrm_state.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 69520ad3d83b..3a000f289dcd 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1510,6 +1510,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig,
 	}
 
 	memcpy(&x->mark, &orig->mark, sizeof(x->mark));
+	memcpy(&x->props.smark, &orig->props.smark, sizeof(x->props.smark));
 
 	if (xfrm_init_state(x) < 0)
 		goto error;
-- 
2.17.1


  parent reply	other threads:[~2020-09-28  8:24 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-28  8:24 pull request (net): ipsec 2020-09-28 Steffen Klassert
2020-09-28  8:24 ` [PATCH 1/8] ip_vti: Fix unused variable warning Steffen Klassert
2020-09-28  8:24 ` [PATCH 2/8] espintcp: restore IP CB before handing the packet to xfrm Steffen Klassert
2020-09-28  8:24 ` [PATCH 3/8] xfrmi: drop ignore_df check before updating pmtu Steffen Klassert
2020-09-28  8:24 ` Steffen Klassert [this message]
2020-09-28  8:24 ` [PATCH 5/8] xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate Steffen Klassert
2020-09-28  8:24 ` [PATCH 6/8] xfrm: clone XFRMA_SEC_CTX " Steffen Klassert
2020-09-28  8:24 ` [PATCH 7/8] xfrm: clone whole liftime_cur structure " Steffen Klassert
2020-09-28  8:24 ` [PATCH 8/8] xfrm: Use correct address family in xfrm_state_find Steffen Klassert
2020-09-28 19:25 ` pull request (net): ipsec 2020-09-28 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200928082450.29414-5-steffen.klassert@secunet.com \
    --to=steffen.klassert@secunet.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.