Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2083713imu; Wed, 28 Nov 2018 22:05:56 -0800 (PST) X-Google-Smtp-Source: AFSGD/WI38qr4s7vSTM+D6eIWMYUlYZzsr6ARNUoYieYF2S6XSCPDh2gzSuZIsQZ5nIhqFy2osjA X-Received: by 2002:a17:902:a03:: with SMTP id 3mr227746plo.112.1543471556784; Wed, 28 Nov 2018 22:05:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543471556; cv=none; d=google.com; s=arc-20160816; b=pIpNqrqLzRpRu4VKWTUCSRkfEWMoXhfBhGrM8yYGKu3R1bmkNbuOXIDVJ3IiRUa/ec iZt9PAD2dYnlWLTKdcU5FEe+E2m8KaFy/vmX94R/WxqLFFOCxIvYWYOcWNoie01rY4wi xd4rvtur69l9Sk3M9mS1uDllwEtI2hM94PapVfVfPxArZnOAvIcCPmRTaVfnSgs+YRIP wefp1DglMqNHuvXnsiKSbqoUWLxaIqXLWAIeBj/95aeX5v4QNJJmKtrsBzF1eehCXfzh O2BDDGMyRrrkhNrwBlin4G53mHc6kFXRZBRNyvZ+m9VGaURZll/lZGY5G0cw+pGk03Bc 8v5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=77oNO4biQqJoOgLt8oaZlXLO9MBE7/EGYISH0fqdpzs=; b=Mg5TfMY5Wv1B8ib59TrRLysPqJfc1fx55KjGdkgQEl0mphXBKcYCi7WCj8Ea5khkXn PKPAUTDcDMI7+Lhwd+ejVHJcL9c2XZREKsFoIlKqiYH3S3jjdK0YEs/w1ttRGqWmO2d7 7C/KRbFb5G6aeJr5QZc9X6wg7+snnUIugooKWv/jVWbL6fvD3+H3B74PXjFyFS7Ctimf vyzW8564Wpo4Svwvr34XZWCIYmMXR0QuxE35VZYa1DDfAfVBEs85K06zbjM0tSNO0oby CevdHVjtk940l/EH46u/f3XY/MAXToYmxB1ljSBcD1YfuI1bzi+0yLNHR9AUj4RAmMuL /JqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DnHNFw6n; 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 h31si1059727pgl.482.2018.11.28.22.05.42; Wed, 28 Nov 2018 22:05:56 -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=DnHNFw6n; 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 S1729836AbeK2RHV (ORCPT + 99 others); Thu, 29 Nov 2018 12:07:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:44578 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728459AbeK2RHV (ORCPT ); Thu, 29 Nov 2018 12:07:21 -0500 Received: from sasha-vm.mshome.net (unknown [37.142.5.207]) (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 5988D2145D; Thu, 29 Nov 2018 06:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543471389; bh=cUE5hc7JIO3lE/HLj1gVT3lT19UVR+CaM+IlR7qPCsY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DnHNFw6niKJf2t5gHs0fBAAV5Iy2b6KT9dZ9V5SrceGU5rmJ0k4sWhWF5V1H3/7Xw T7S4YmyuNhRBetuyOExreod4oFO242UrAGhdmyStqkA9uNeuBn/TuaRCG78iZLKAta u3Ao/+H1jSNb7jWNEFOmsNSQHeHz/eOJW9BNM/dM= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Falcon , "David S . Miller" , Sasha Levin , linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 30/35] ibmvnic: Fix RX queue buffer cleanup Date: Thu, 29 Nov 2018 01:01:04 -0500 Message-Id: <20181129060110.159878-30-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181129060110.159878-1-sashal@kernel.org> References: <20181129060110.159878-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Falcon [ Upstream commit b7cdec3d699db2e5985ad39de0f25d3b6111928e ] The wrong index is used when cleaning up RX buffer objects during release of RX queues. Update to use the correct index counter. Signed-off-by: Thomas Falcon Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ibm/ibmvnic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 5c7134ccc1fd..14c53ed5cca6 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -457,8 +457,8 @@ static void release_rx_pools(struct ibmvnic_adapter *adapter) for (j = 0; j < rx_pool->size; j++) { if (rx_pool->rx_buff[j].skb) { - dev_kfree_skb_any(rx_pool->rx_buff[i].skb); - rx_pool->rx_buff[i].skb = NULL; + dev_kfree_skb_any(rx_pool->rx_buff[j].skb); + rx_pool->rx_buff[j].skb = NULL; } } -- 2.17.1