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 3EE7FA04A3 for ; Fri, 5 Jun 2020 20:27:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 055061D534; Fri, 5 Jun 2020 20:27:07 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id EB73F1D528 for ; Fri, 5 Jun 2020 20:27:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EZn9T9m9juQlhjHDcSieS0D0uisf9EQ4uTvJMka0RO0=; b=UsO86/aJudOa1CA2YPmTA3UANu/LPLTcjwbJ3AhzqB1GWKAgcGOv+EC8G2m6bD4+/kaAJw Y2lYYS80fXcmNceMg78fml61ao6jWvOonjXHLFxcZYZ/k6dc61LEX2JQgFVShoNDKu9j+T ZVl+0xDob2IZuQ8ZB1CvMLjaPVXy5ko= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-443-hCcKIrryNT6Pv93uKC9Y6w-1; Fri, 05 Jun 2020 14:27:01 -0400 X-MC-Unique: hCcKIrryNT6Pv93uKC9Y6w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A8C681CBF3; Fri, 5 Jun 2020 18:27:00 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2381960C47; Fri, 5 Jun 2020 18:26:58 +0000 (UTC) From: Kevin Traynor To: Apeksha Gupta Cc: Hemant Agrawal , dpdk stable Date: Fri, 5 Jun 2020 19:24:37 +0100 Message-Id: <20200605182525.22483-40-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/fslmc: fix dereferencing null pointer' has been queued to LTS release 18.11.9 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 LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/7afb16b952e36c086613f9511fdc87755a241e33 Thanks. Kevin. --- >From 7afb16b952e36c086613f9511fdc87755a241e33 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 @@ -28,4 +28,5 @@ int qbman_fq_query_state(struct qbman_swp *s, uint32_t fqid, { struct qbman_fq_query_desc *p; + struct qbman_fq_query_np_rslt *var; p = (struct qbman_fq_query_desc *)qbman_swp_mc_start(s); @@ -34,11 +35,11 @@ int qbman_fq_query_state(struct qbman_swp *s, uint32_t fqid, 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 */ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:53.053741008 +0100 +++ 0040-bus-fslmc-fix-dereferencing-null-pointer.patch 2020-06-05 19:20:50.816040677 +0100 @@ -1 +1 @@ -From 27ede02945b31e952a66c1bdbf7cf9481698d8dd Mon Sep 17 00:00:00 2001 +From 7afb16b952e36c086613f9511fdc87755a241e33 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 27ede02945b31e952a66c1bdbf7cf9481698d8dd ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org