From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1796C468BD for ; Sun, 9 Jun 2019 16:44:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1D6020840 for ; Sun, 9 Jun 2019 16:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560098644; bh=4z+CNzBm9U/1F/ScUJeAfwdnRGEeNt33hnqlxDsl0AI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=h5AmD33vPtB08fbQp6DWh2wdQciuDTjEQY8x6/ioxIMln3S7ZybhlH9v07CCffmNu yymKT8EqKfCItaARMT8IAc24rLePP0ELZw1PBGTMkVGWyffqKQNQvWUaGKn0KzOuk8 45rPx1n+Y99j9GPtU80E9bi+n71GIJozVtUi5BUU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729053AbfFIQoE (ORCPT ); Sun, 9 Jun 2019 12:44:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:40956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728858AbfFIQoD (ORCPT ); Sun, 9 Jun 2019 12:44:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B18E72081C; Sun, 9 Jun 2019 16:44:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560098643; bh=4z+CNzBm9U/1F/ScUJeAfwdnRGEeNt33hnqlxDsl0AI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KLEKMKwx3k2oP/mtssXmj0GGKRcYAEXqxnu+/cMjVnfTUff1f7PEWyToziXJRphlu Vrxva/raaZL1ig3siBzri2r36dl2NjKn1Zmct5sw7509bp4i90vwGRR69LSRkOWJ3i 8mxuuW/WGYwkMiiFcDIw8DT5RiDxp2RevspnZi9c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vivien Didelot , Michal Kubecek , "David S. Miller" Subject: [PATCH 5.1 01/70] ethtool: fix potential userspace buffer overflow Date: Sun, 9 Jun 2019 18:41:12 +0200 Message-Id: <20190609164127.613168840@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164127.541128197@linuxfoundation.org> References: <20190609164127.541128197@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vivien Didelot [ 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. Signed-off-by: Vivien Didelot Reviewed-by: Michal Kubecek Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/ethtool.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1358,13 +1358,16 @@ static int ethtool_get_regs(struct net_d if (!regbuf) return -ENOMEM; + if (regs.len < reglen) + reglen = regs.len; + ops->get_regs(dev, ®s, regbuf); ret = -EFAULT; if (copy_to_user(useraddr, ®s, sizeof(regs))) goto out; useraddr += offsetof(struct ethtool_regs, data); - if (regbuf && copy_to_user(useraddr, regbuf, regs.len)) + if (copy_to_user(useraddr, regbuf, reglen)) goto out; ret = 0;