From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 49823A0093 for ; Tue, 19 May 2020 15:16:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 395501D96D; Tue, 19 May 2020 15:16:16 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id A62451D960 for ; Tue, 19 May 2020 15:16:14 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id f134so3038712wmf.1 for ; Tue, 19 May 2020 06:16:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LlqhURz1qGunCKptsfPa98YB19MfebiewDfDPeS0txw=; b=uBR9iTrkilOSLJDcvpi9X9NjFkPWKqYI1tE6lBpaukSiLEMwpc9Ez7N3Ir7kx7d2// Kvlc2gOGufXJHJG0dB+PQJgTWMDSqUX+SX/1xWG8TMjE1NfuwgF3O5+jWejdCeJOp976 56DYjPdjlc0B4b8DDA5ERwA1uqq/+w8DHb+WmGvLF1HA5BgCE3HucMCuGyDoBxG54+fe IRSY2YjikHMkCheXYa7aM0C/YG3asjmdre64ZFyOxH6qlwyhV3vDsEbofrZFAH1OTNbS XLov1xrD3iv9424gG3gGBrwBcyNlg8sQGVAYVdBccPZ4+1rWwgOp7r9n5YuVV76AiQi9 1Q2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LlqhURz1qGunCKptsfPa98YB19MfebiewDfDPeS0txw=; b=rSreTAolyvnIBm3LYx+vjmpfsss1MiBotMzYhE0lhT/wh8je2UCBd1DQbl1//IA4Ws P4d2pBc2qAVBf54aYqRnI21mxakAt9CzNVIoCAD82RSDhI+6oom0oWWWgerNRpVQbfeo R4hKxJE6b0ogN6DAs5wf1+31WSDX27ZEKb0V8ar+hhKfkelyHjn5Bh8Es9Seeoh6fbRQ NJekK1HMv505jhuaS7njjFhqimx0eCaYP1ANo6mu39OOgL7p5E51BPwUYoCVZlS7f+L7 qH28FgdbOZqbL7Tt04ivAO2Bp7RDlWXibvdT1gEoKqzEep99YJLD+mwTk1dgN2muPYpf sP9Q== X-Gm-Message-State: AOAM532UNDLpUpi3fFfva02kkNnXuxGuOAo6UwW8FpZqkHStpnZ+K9mh GMvXK780YXgsvYYbJya4G6w= X-Google-Smtp-Source: ABdhPJyY1W3PTf+/ZQJUhAR8woH50tlhQ7IjStvu1UXAAN3Nql1/zci7v6BLeJc6p7V/aZUlEEd7/Q== X-Received: by 2002:a1c:9e8a:: with SMTP id h132mr5539722wme.32.1589894174411; Tue, 19 May 2020 06:16:14 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q4sm3838281wma.9.2020.05.19.06.16.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:16:13 -0700 (PDT) From: luca.boccassi@gmail.com To: Apeksha Gupta Cc: Hemant Agrawal , dpdk stable Date: Tue, 19 May 2020 14:05:33 +0100 Message-Id: <20200519130549.112823-198-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/fslmc: fix dereferencing null pointer' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the 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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From ef6d112d7d5eec99030464e162f8b21428454403 Mon Sep 17 00:00:00 2001 From: Apeksha Gupta Date: Fri, 8 May 2020 18:32:02 +0530 Subject: [PATCH] bus/fslmc: fix dereferencing null pointer [ upstream commit 27ede02945b31e952a66c1bdbf7cf9481698d8dd ] Fixes: 6fef517e17cf ("bus/fslmc: add qman HW fq query count API") Signed-off-by: Apeksha Gupta Acked-by: Hemant Agrawal --- drivers/bus/fslmc/qbman/qbman_debug.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/bus/fslmc/qbman/qbman_debug.c b/drivers/bus/fslmc/qbman/qbman_debug.c index 0bb2ce880f..4cd0923acb 100644 --- a/drivers/bus/fslmc/qbman/qbman_debug.c +++ b/drivers/bus/fslmc/qbman/qbman_debug.c @@ -27,19 +27,20 @@ int qbman_fq_query_state(struct qbman_swp *s, uint32_t fqid, struct qbman_fq_query_np_rslt *r) { struct qbman_fq_query_desc *p; + struct qbman_fq_query_np_rslt *var; p = (struct qbman_fq_query_desc *)qbman_swp_mc_start(s); if (!p) return -EBUSY; p->fqid = fqid; - *r = *(struct qbman_fq_query_np_rslt *)qbman_swp_mc_complete(s, p, - QBMAN_FQ_QUERY_NP); - if (!r) { + var = qbman_swp_mc_complete(s, p, QBMAN_FQ_QUERY_NP); + if (!var) { pr_err("qbman: Query FQID %d NP fields failed, no response\n", fqid); return -EIO; } + *r = *var; /* Decode the outcome */ QBMAN_BUG_ON((r->verb & QBMAN_RESPONSE_VERB_MASK) != QBMAN_FQ_QUERY_NP); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:52.682163223 +0100 +++ 0198-bus-fslmc-fix-dereferencing-null-pointer.patch 2020-05-19 14:04:44.572654826 +0100 @@ -1,10 +1,11 @@ -From 27ede02945b31e952a66c1bdbf7cf9481698d8dd Mon Sep 17 00:00:00 2001 +From ef6d112d7d5eec99030464e162f8b21428454403 Mon Sep 17 00:00:00 2001 From: Apeksha Gupta Date: Fri, 8 May 2020 18:32:02 +0530 Subject: [PATCH] bus/fslmc: fix dereferencing null pointer +[ upstream commit 27ede02945b31e952a66c1bdbf7cf9481698d8dd ] + Fixes: 6fef517e17cf ("bus/fslmc: add qman HW fq query count API") -Cc: stable@dpdk.org Signed-off-by: Apeksha Gupta Acked-by: Hemant Agrawal