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;
Date:   Mon, 10 Jun 2019 16:23:23 +0200
From:   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To:     Michal Kubecek <mkubecek@suse.cz>
Cc:     stable@vger.kernel.org, Pavel Machek <pavel@denx.de>,
        linux-kernel@vger.kernel.org,
        Vivien Didelot <vivien.didelot@gmail.com>,
        "David S. Miller" <davem@davemloft.net>
Subject: Re: [PATCH 4.19 01/51] ethtool: fix potential userspace buffer
 overflow
Message-ID: <20190610142323.GD5937@kroah.com>
References: <20190609164127.123076536@linuxfoundation.org>
 <20190609164127.215699992@linuxfoundation.org>
 <20190610082112.GA8783@amd>
 <20190610084229.GA31797@unicorn.suse.cz>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190610084229.GA31797@unicorn.suse.cz>
User-Agent: Mutt/1.12.0 (2019-05-25)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, Jun 10, 2019 at 10:42:29AM +0200, Michal Kubecek wrote:
> On Mon, Jun 10, 2019 at 10:21:12AM +0200, Pavel Machek wrote:
> > Hi!
> > 
> > > From: Vivien Didelot <vivien.didelot@gmail.com>
> > > 
> > > [ Upstream commit 0ee4e76937d69128a6a66861ba393ebdc2ffc8a2 ]
> > > 
> > > ethtool_get_regs() allocates a buffer of size ops->get_regs_len(),
> > > and pass it to the kernel driver via ops->get_regs() for filling.
> > > 
> > > There is no restriction about what the kernel drivers can or cannot do
> > > with the open ethtool_regs structure. They usually set regs->version
> > > and ignore regs->len or set it to the same size as ops->get_regs_len().
> > > 
> > > But if userspace allocates a smaller buffer for the registers dump,
> > > we would cause a userspace buffer overflow in the final copy_to_user()
> > > call, which uses the regs.len value potentially reset by the driver.
> > > 
> > > To fix this, make this case obvious and store regs.len before calling
> > > ops->get_regs(), to only copy as much data as requested by userspace,
> > > up to the value returned by ops->get_regs_len().
> > > 
> > > While at it, remove the redundant check for non-null regbuf.
> > 
> > Mainline differs from 4.19-stable here, and while the non-null check
> > is redundant in -mainline, it does not seem to be redundant in
> > -stable.
> > 
> > In stable, if get_regs_len() returns < 0, we'll pass it to vzalloc.
> 
> Right. :-(
> 
> I guess we should also pick commit f9fc54d313fa ("ethtool: check the
> return value of get_regs_len") to stable branches before 5.0.

Now queued up, thanks.

greg k-h