Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753360AbdGCMws (ORCPT <rfc822;w@1wt.eu>);
        Mon, 3 Jul 2017 08:52:48 -0400
Received: from mail.linuxfoundation.org ([140.211.169.12]:57052 "EHLO
        mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751738AbdGCMwp (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 3 Jul 2017 08:52:45 -0400
Date: Mon, 3 Jul 2017 14:52:45 +0200
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Ben Hutchings <ben.hutchings@codethink.co.uk>
Cc: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>,
        Simon Horman <horms+renesas@verge.net.au>,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
        "David S. Miller" <davem@davemloft.net>,
        Sasha Levin <alexander.levin@verizon.com>
Subject: Re: [PATCH 4.4 35/46] ravb: unmap descriptors when freeing rings
Message-ID: <20170703125245.GA24159@kroah.com>
References: <20170615175218.286057711@linuxfoundation.org>
 <20170615175219.950368309@linuxfoundation.org>
 <1498744689.1935.41.camel@codethink.co.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1498744689.1935.41.camel@codethink.co.uk>
User-Agent: Mutt/1.8.3 (2017-05-23)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1690
Lines: 53

On Thu, Jun 29, 2017 at 02:58:09PM +0100, Ben Hutchings wrote:
> On Thu, 2017-06-15 at 19:52 +0200, Greg Kroah-Hartman wrote:
> > 4.4-stable review patch.  If anyone has any objections, please let me know.
> > 
> > ------------------
> > 
> > From: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
> > 
> > 
> > [ Upstream commit a47b70ea86bdeb3091341f5ae3ef580f1a1ad822 ]
> > 
> > "swiotlb buffer is full" errors occur after repeated initialisation of a
> > device - f.e. suspend/resume or ip link set up/down. This is because memory
> > mapped using dma_map_single() in ravb_ring_format() and ravb_start_xmit()
> > is not released.  Resolve this problem by unmapping descriptors when
> > freeing rings.
> 
> This should be followed by:
> 
> commit 79514ef670e9e575a1fe36922268c439d0f0ca8a
> Author: Eugeniu Rosca <erosca@de.adit-jv.com>
> Date:   Tue Jun 6 00:08:10 2017 +0200
> 
>     ravb: Fix use-after-free on `ifconfig eth0 down`

Thanks, now queued up.

> But also, this loop looks wrong:
> 
> [...]
> >  	if (priv->rx_ring[q]) {
> > +		for (i = 0; i < priv->num_rx_ring[q]; i++) {
> > +			struct ravb_ex_rx_desc *desc = &priv->rx_ring[q][i];
> > +
> > +			if (!dma_mapping_error(ndev->dev.parent,
> > +					       le32_to_cpu(desc->dptr)))
> > +				dma_unmap_single(ndev->dev.parent,
> > +						 le32_to_cpu(desc->dptr),
> > +						 PKT_BUF_SZ,
> > +						 DMA_FROM_DEVICE);
> > +		}
> [...]
> 
> It's possible that the driver hasn't filled (or attempted to fill or
> refill) every RX descriptor, so this could result in a double-unmap.  I
> think this needs to use cur_rx and dirty_rx to determine which
> descriptors to process.

I'll let Kazuya fix that :)

thanks,

greg k-h