Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DD86C433E1 for ; Mon, 24 Aug 2020 09:44:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 072242071E for ; Mon, 24 Aug 2020 09:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729053AbgHXJoe (ORCPT ); Mon, 24 Aug 2020 05:44:34 -0400 Received: from a.mx.secunet.com ([62.96.220.36]:44072 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729040AbgHXInS (ORCPT ); Mon, 24 Aug 2020 04:43:18 -0400 Received: from localhost (localhost [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id 656EF20536; Mon, 24 Aug 2020 10:43:17 +0200 (CEST) X-Virus-Scanned: by secunet Received: from a.mx.secunet.com ([127.0.0.1]) by localhost (a.mx.secunet.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zVg6_o3vxt0a; Mon, 24 Aug 2020 10:43:16 +0200 (CEST) Received: from mail-essen-02.secunet.de (mail-essen-02.secunet.de [10.53.40.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by a.mx.secunet.com (Postfix) with ESMTPS id EB6F2204FD; Mon, 24 Aug 2020 10:43:16 +0200 (CEST) Received: from mbx-essen-01.secunet.de (10.53.40.197) by mail-essen-02.secunet.de (10.53.40.205) with Microsoft SMTP Server (TLS) id 14.3.487.0; Mon, 24 Aug 2020 10:43:16 +0200 Received: from gauss2.secunet.de (10.182.7.193) by mbx-essen-01.secunet.de (10.53.40.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Mon, 24 Aug 2020 10:43:16 +0200 Received: by gauss2.secunet.de (Postfix, from userid 1000) id 56D683180449; Mon, 24 Aug 2020 10:43:16 +0200 (CEST) Date: Mon, 24 Aug 2020 10:43:16 +0200 From: Steffen Klassert To: Antony Antony CC: , Herbert Xu , "Antony Antony" Subject: Re: [PATCH 2/3] xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate Message-ID: <20200824084316.GO20687@gauss3.secunet.de> References: <20200820181158.GA19658@moon.secunet.de> <20200820181452.GA19740@moon.secunet.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20200820181452.GA19740@moon.secunet.de> User-Agent: Mutt/1.9.4 (2018-02-28) X-ClientProxiedBy: cas-essen-01.secunet.de (10.53.40.201) To mbx-essen-01.secunet.de (10.53.40.197) X-EXCLAIMER-MD-CONFIG: 2c86f778-e09b-4440-8b15-867914633a10 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Aug 20, 2020 at 08:14:52PM +0200, Antony Antony wrote: > XFRMA_REPLAY_ESN_VAL was not cloned from the old to the new. > Migrate this attribute during XFRMA_MSG_MIGRATE > > Signed-off-by: Antony Antony > --- > include/net/xfrm.h | 16 ++++++---------- > net/xfrm/xfrm_state.c | 2 +- > 2 files changed, 7 insertions(+), 11 deletions(-) > > diff --git a/include/net/xfrm.h b/include/net/xfrm.h > index 2737d24ec244..9e806c781025 100644 > --- a/include/net/xfrm.h > +++ b/include/net/xfrm.h > @@ -1773,21 +1773,17 @@ static inline unsigned int xfrm_replay_state_esn_len(struct xfrm_replay_state_es > static inline int xfrm_replay_clone(struct xfrm_state *x, > struct xfrm_state *orig) > { > - x->replay_esn = kzalloc(xfrm_replay_state_esn_len(orig->replay_esn), > + > + x->replay_esn = kmemdup(orig->replay_esn, > + xfrm_replay_state_esn_len(orig->replay_esn), > GFP_KERNEL); > if (!x->replay_esn) > return -ENOMEM; > - > - x->replay_esn->bmp_len = orig->replay_esn->bmp_len; > - x->replay_esn->replay_window = orig->replay_esn->replay_window; > - > - x->preplay_esn = kmemdup(x->replay_esn, > - xfrm_replay_state_esn_len(x->replay_esn), > + x->preplay_esn = kmemdup(orig->preplay_esn, > + xfrm_replay_state_esn_len(orig->preplay_esn), > GFP_KERNEL); > - if (!x->preplay_esn) { > - kfree(x->replay_esn); > + if (!x->preplay_esn) > return -ENOMEM; > - } > > return 0; > } > diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c > index 3a000f289dcd..20a12c67a931 100644 > --- a/net/xfrm/xfrm_state.c > +++ b/net/xfrm/xfrm_state.c > @@ -1522,7 +1522,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, > x->tfcpad = orig->tfcpad; > x->replay_maxdiff = orig->replay_maxdiff; > x->replay_maxage = orig->replay_maxage; > - x->curlft.add_time = orig->curlft.add_time; > + x->curlft = orig->curlft; That change seems not to belong to this patch. Also please add a 'Fixes' tag.