Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp437164imu; Wed, 12 Dec 2018 20:53:31 -0800 (PST) X-Google-Smtp-Source: AFSGD/Ws3NoUk6MLCgdcrEZkKiEDKcOb14sjT9z7rQ6IkbkIPl8uoeqbohKwnenqGmr3SB9avk+V X-Received: by 2002:a63:d047:: with SMTP id s7mr20436989pgi.311.1544676811369; Wed, 12 Dec 2018 20:53:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544676811; cv=none; d=google.com; s=arc-20160816; b=iCf3KBUqrkYFdtZLWxF0t4fswY7w9MVeugu+HlgsK1x9CyfgKv5WVDhrO9J0p0zb1C zEewQCmyl5KJS/HeVUp57orHJQwjHMbroBk7AbZ02+LPcdMo8isb8c5+HTRLaxdBdqQs 4xuSz8hDyyEJga4/taUkmAzomEUHwIziNOMHS7kU/teWvxgh22du2ZxDtHO4wVEa/ySq 3LkoaQi/crf0FJUTGTPSqlhQ4p/xIZHGo5mdlsZS5nKk8xlT8LxZA1YoxnJZVT3X42LA +v0nGGjEUGjWZiNEGKhokKErIYjA1OfzSCv39CiwODnlnxGCGn7ZvjN+XTfEf2dj2IUg Su7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PC69ok4ATy7c+xMQ2tKf41kBTbBEMJZ0lmmEtB62/do=; b=LLl3qYRDVwXqOdmJ61qv0dyTP01RSVlYyWbHWhCcaj6a6vH7IObWtinvH2c3YnBllC typDMm+Bsdkv9w+8rnijz2K88StIot/JBY1+MjWVxJSiISRkK5aTrEBkgKRURDGOXwQ2 C9rdgc9vYOytdOlyOFWIIFoclMPNpm9C57Y4Ih4kp/fhpR6Zof4bRVE2l2MnyMEQD15q Jle2qFbjvUjWt4hrZnpuANBdSN2cReNiaugpWxSN98AAvVwyy2FVX+x969saqQ7d7AO+ yrbeM2Juu6TBAbiianu4mPD8J+2Rgn2rf2aQ+kXUIgq1T2FNNyFLV7P31jQXZbH/BXfO 7Feg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BDKUvwyw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q8si629759plr.382.2018.12.12.20.53.16; Wed, 12 Dec 2018 20:53:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BDKUvwyw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728003AbeLMEuq (ORCPT + 99 others); Wed, 12 Dec 2018 23:50:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:42326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727540AbeLME3S (ORCPT ); Wed, 12 Dec 2018 23:29:18 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F17F720880; Thu, 13 Dec 2018 04:29:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675357; bh=6ML7Ps8EVQLTfG55QOt3UddSmeQJRzLpsk34Z8Viajc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BDKUvwywTHXRtUJ+1IsSG+AbYEDfEfb5XGzaTuyCIzEcL92UCtN9DAqawPZsUgspq 5Xf1xYaGPTZtLHuIfa2McYsP9QM61CxgDV4WfmjoWNkW+j7v2DAZsM4CX6XwSZq62t 5oJ2nDzYrE0+Qe2JmLUBokUezgVYBoa1EsULxY34= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pan Bian , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 24/73] liquidio: read sc->iq_no before release sc Date: Wed, 12 Dec 2018 23:27:49 -0500 Message-Id: <20181213042838.75160-24-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> References: <20181213042838.75160-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pan Bian [ Upstream commit c0f53771ba45745e5870daf880127925c93f232f ] The function lio_vf_rep_packet_sent_callback releases the occupation of sc via octeon_free_soft_command. sc should not be used after that. Unfortunately, sc->iq_no is read. To fix this, the patch stores sc->iq_no into a local variable before releasing sc and then uses the local variable instead of sc->iq_no. Signed-off-by: Pan Bian Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c index ddd7431579f4..c99b59fe4c8f 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c @@ -367,13 +367,15 @@ lio_vf_rep_packet_sent_callback(struct octeon_device *oct, struct octeon_soft_command *sc = (struct octeon_soft_command *)buf; struct sk_buff *skb = sc->ctxptr; struct net_device *ndev = skb->dev; + u32 iq_no; dma_unmap_single(&oct->pci_dev->dev, sc->dmadptr, sc->datasize, DMA_TO_DEVICE); dev_kfree_skb_any(skb); + iq_no = sc->iq_no; octeon_free_soft_command(oct, sc); - if (octnet_iq_is_full(oct, sc->iq_no)) + if (octnet_iq_is_full(oct, iq_no)) return; if (netif_queue_stopped(ndev)) -- 2.19.1