From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 86808A034F for ; Wed, 11 Aug 2021 10:51:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4692C40040; Wed, 11 Aug 2021 10:51:12 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 5462B40040 for ; Wed, 11 Aug 2021 10:51:11 +0200 (CEST) Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 13F063F363 for ; Wed, 11 Aug 2021 08:51:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628671871; bh=8xblN0AmaSBxMV+5wuaNCtr72Hnx440YbkIHre5h8UY=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=srueVYnR/3gnQZdjdR/f6Ac520EMuxZ2mJIFTKrQQblyNPfUr7WvZAg0s/jr0pHIp FJz3V0GzL+lp41oLhVWVhElYlanArHiuKQZj5bsdSGSyuvYaXthH6QVMyntZhM2S15 FPW3U26/ormyEGn8zcYWLkuUk5JWZja+lsIeDEJzZjrcCVmCqrwurHqbQ4+Kv2eYdC KuUnosBjk2doeefvNVEeBmOvmVIwSBwNzGJXGPWEX1CR3DWyLUTwVr8B+u6qTyI29J Dm0ECAJYVOKMT2e0zXlq9XYP+qb2BWDuYSNVIAnYbcli7LEtedPyEC8wKLWRz2U3M8 6wJOMu8XFtrzA== Received: by mail-qk1-f200.google.com with SMTP id c196-20020ae9edcd0000b02903c9e325c3b2so946199qkg.2 for ; Wed, 11 Aug 2021 01:51:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=8xblN0AmaSBxMV+5wuaNCtr72Hnx440YbkIHre5h8UY=; b=Wma7imCvzOmC/ypM62m8o5LfRyl3GWvbiftED7moIYlYfQHIUB39dGM5PNh7RDGmYb yDASbNGQUALUAKzcsFg92XjIP8EJ47dhbqGBoVRrPPCexBvR2yZTSvi8Cw+9lHNu+sFH aC30AunpmABcQ2VP9Ysgrtw87xaJWpcVlvvF+MUGn84PbI5Ew/jN2d41B8N0KDWlr/3T dlNHgPFSGTdS/5xu/I2lVtY9mA72hYvvtb48Eujuc5P8yC5NqhebrdbkMXbFgsjnxYHb nwWEclqpz/ObNzg25z8b1k7n1bTEzgm0B6EEQTtApTWJX2/z/Yx/QkQ32Wr/uBDpH7XH 1JiQ== X-Gm-Message-State: AOAM53284E7Sl5HOAnlS8SsocavQmIf9Py04yacbGL5ojypCOz76kc0z eIm6/q/gP7OCwbpqXdhLW3CAOcTuotrPKlTLM0ebH/u698w50GQwSloil5UV0qsnPtVHKmOdm16 ocNKxsjcz2Jc5DGT9xc2UCPdwFcQEqZk3TqpCq+96 X-Received: by 2002:a05:622a:652:: with SMTP id a18mr10595291qtb.112.1628671869861; Wed, 11 Aug 2021 01:51:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwb2AnxJL5o6h5nFfHsOOkv+4AWf4lpvspebA1bq+wGm1WOi+dIAoxZREHstnLcKWmRCazmecU0t34insNJsmg= X-Received: by 2002:a05:622a:652:: with SMTP id a18mr10595281qtb.112.1628671869672; Wed, 11 Aug 2021 01:51:09 -0700 (PDT) MIME-Version: 1.0 References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> <20210810154022.749358-78-christian.ehrhardt@canonical.com> In-Reply-To: <20210810154022.749358-78-christian.ehrhardt@canonical.com> From: Christian Ehrhardt Date: Wed, 11 Aug 2021 10:50:44 +0200 Message-ID: To: Kalesh AP Cc: Ajit Khaparde , Lance Richardson , dpdk stable Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-stable] patch 'net/bnxt: fix null dereference in interrupt handler' has been queued to stable release 19.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On Tue, Aug 10, 2021 at 5:44 PM wrote: > > Hi, > > FYI, your patch has been queued to stable release 19.11.10 Hi, while applying cleanly your patch caused build time failures like: ../drivers/net/bnxt/bnxt_irq.c: In function =E2=80=98bnxt_int_handler=E2=80= =99: ../drivers/net/bnxt/bnxt_irq.c:48:3: error: =E2=80=98cp_ring_size=E2=80=99 = undeclared (first use in this function) 48 | cp_ring_size =3D cpr->cp_ring_struct->ring_size; | ^~~~~~~~~~~~ Therefore the patch will be de-qeueud from the stable branch that shall bec= ome 19.11.10. Please consider having a look and providing a backport. A backport should contain a reference to the DPDK main branch commit in it's commit message in the following fashion: [ upstream commit ] For example: https://git.dpdk.org/dpdk-stable/commit/?h=3D18.11&id=3Dd90e6ae6f936ecd= c2fd3811ff9f26aec7f3c06eb When sending the backported patch, please indicate the target branch in the subject line, as we have multiple branches, for example: [PATCH 19.11] foo/bar: fix baz With git format-patch, this can be achieved by appending the parameter: --subject-prefix=3D'PATCH 19.11' Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org". FYI, branch 19.11 is located at tree: https://git.dpdk.org/dpdk-stable Thanks in advance, Chrtistian > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 08/12/21. So please > shout if anyone has objections. > > Also note that after the patch there's a diff of the upstream commit vs t= he > patch applied to the branch. This will indicate if there was any rebasing > needed to apply to the stable branch. If there were code changes for reba= sing > (ie: not only metadata diffs), please double check that the rebase was > correctly done. > > Queued patches are on a temporary branch at: > https://github.com/cpaelzer/dpdk-stable-queue > > This queued commit can be viewed at: > https://github.com/cpaelzer/dpdk-stable-queue/commit/8945c5a358b46e235128= 9050d4c1df982e76c95c > > Thanks. > > Christian Ehrhardt > > --- > From 8945c5a358b46e2351289050d4c1df982e76c95c Mon Sep 17 00:00:00 2001 > From: Kalesh AP > Date: Tue, 20 Jul 2021 21:51:58 +0530 > Subject: [PATCH] net/bnxt: fix null dereference in interrupt handler > > [ upstream commit 3f44ec48c733f7d7607877164c9aa0305de9cecd ] > > Coverity reports that pointer "cpr->cp_ring_struct" may be > dereferenced with null value. This patch fixes this. > > Coverity issue: 372063 > Fixes: 5ed30db87fa8 ("net/bnxt: fix missing barriers in completion handli= ng") > > Signed-off-by: Kalesh AP > Reviewed-by: Ajit Khaparde > Reviewed-by: Lance Richardson > --- > drivers/net/bnxt/bnxt_irq.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/bnxt/bnxt_irq.c b/drivers/net/bnxt/bnxt_irq.c > index 93779f4e0c..1f33429116 100644 > --- a/drivers/net/bnxt/bnxt_irq.c > +++ b/drivers/net/bnxt/bnxt_irq.c > @@ -45,6 +45,7 @@ void bnxt_int_handler(void *param) > return; > } > > + cp_ring_size =3D cpr->cp_ring_struct->ring_size; > cons =3D RING_CMP(cpr->cp_ring_struct, raw_cons); > cmp =3D &cpr->cp_desc_ring[cons]; > > -- > 2.32.0 > > --- > Diff of the applied patch vs upstream commit (please double-check if no= n-empty: > --- > --- - 2021-08-10 15:11:16.029545681 +0200 > +++ 0078-net-bnxt-fix-null-dereference-in-interrupt-handler.patch 2= 021-08-10 15:11:13.090638619 +0200 > @@ -1 +1 @@ > -From 3f44ec48c733f7d7607877164c9aa0305de9cecd Mon Sep 17 00:00:00 2001 > +From 8945c5a358b46e2351289050d4c1df982e76c95c Mon Sep 17 00:00:00 2001 > @@ -5,0 +6,2 @@ > +[ upstream commit 3f44ec48c733f7d7607877164c9aa0305de9cecd ] > + > @@ -11 +12,0 @@ > -Cc: stable@dpdk.org > @@ -17,2 +18,2 @@ > - drivers/net/bnxt/bnxt_irq.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > + drivers/net/bnxt/bnxt_irq.c | 1 + > + 1 file changed, 1 insertion(+) > @@ -21 +22 @@ > -index ebdac8385d..122a1f9908 100644 > +index 93779f4e0c..1f33429116 100644 > @@ -24,9 +25 @@ > -@@ -33,7 +33,6 @@ void bnxt_int_handler(void *param) > - return; > - > - raw_cons =3D cpr->cp_raw_cons; > -- cp_ring_size =3D cpr->cp_ring_struct->ring_size; > - pthread_mutex_lock(&bp->def_cp_lock); > - while (1) { > - if (!cpr || !cpr->cp_ring_struct || !cpr->cp_db.doorbell)= { > -@@ -46,6 +45,7 @@ void bnxt_int_handler(void *param) > +@@ -45,6 +45,7 @@ void bnxt_int_handler(void *param) --=20 Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd