Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2459225imj; Mon, 18 Feb 2019 06:24:37 -0800 (PST) X-Google-Smtp-Source: AHgI3Ibr4JtkdW8MfqcloXqgxNeIsrNSr7VK57n/BsQShAS23SY6Kmu5U2tFfo4s/NUSRNmyBxys X-Received: by 2002:a63:1625:: with SMTP id w37mr5667363pgl.13.1550499877020; Mon, 18 Feb 2019 06:24:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550499877; cv=none; d=google.com; s=arc-20160816; b=Qh3Psm8OYcugu54tj0cRpAcuk8VTrYiCTEQCHq4xA+uYZqkef2PHIiBDl/Rc+aGukx SQHLcmZRTU6Zw0/TTA28fbhEBK1mHO2BY2ymRtdky8tJBOo+KbTz6SkEpNIAaGZK5OuJ VLw2CFaLEuqVVMFLA8lUcZYgzAgieycudo46yzcxAj0vihrC5TdxlEevrrBnK3eDZ2TW nIjuk6mmjDH8QHzOLwUzwwsYji+STbHT9FhzhEf1ABM0d5P58mtpJPWCOPzWYLkdD/N8 QzVFfXNNhGGiSruXZ3uqFxhR2yGkD8aKV1+WY60kRWHlPnYPytkcjVESPzOFaWh8lY4k XeTw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=G7Bk+CD4O4pT3joNI8ShG22nKQIYhj9Gt4d4WZMLeJM=; b=LuWQ8mEc6zFr/Ffimks1Kuum3vTLGhAhR7krYPuo7cG30KS7eiuD9e8U2mlbunSFgy 8fz4rHWoRFMQuJJRAKfFTrPNnalCi6xPACxRQgf78k4mvtCnpsiK5l7tyrVTZF0RzUDE GH6GpDdE9jZfL0/65KyqoGPu31gI7cB1bp41nAQ/9CY1PaHlAmkb2EWXBoWqHKqsCqPH +iPxWWZZJMgsmBBwnbCEswF2qg+Rav1hLrxQPGN+Bhla0GeT3oczV12u1DTscK8DSbKW TAjKOpKs/fmS6gHY20vnQsISsQmU0zNdtDhuoPUVIdTbOKaNyNVv+3SoEetIHCV42++Y CMlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2p6AZC1M; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r18si4385776pls.374.2019.02.18.06.24.21; Mon, 18 Feb 2019 06:24:37 -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=2p6AZC1M; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389912AbfBROE3 (ORCPT + 99 others); Mon, 18 Feb 2019 09:04:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:46814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389365AbfBROEU (ORCPT ); Mon, 18 Feb 2019 09:04:20 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 AF8CF2196F; Mon, 18 Feb 2019 14:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498660; bh=2xq+CErBwDFaw6cWqB+Bzs3k8P/zCZVKdW9t33ukngM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2p6AZC1MpUk1ZroxsO+sYFMg+ja9hyVge435BD+v2zdplgMjHXhlWIWy+ILfBF8Y9 aeBJMBUWdYDPLn+z3Lgbh5iaJrtIIt4DRGqfl7E7/oD5bQwZji3PYQrJLps/cfoBg1 WSLArMLSn0YQ2oUE3jhLd6gXFR9pybPVVM/D5nAQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , "David S. Miller" Subject: [PATCH 4.4 080/143] skge: potential memory corruption in skge_get_regs() Date: Mon, 18 Feb 2019 14:43:28 +0100 Message-Id: <20190218133532.003665060@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133529.099444112@linuxfoundation.org> References: <20190218133529.099444112@linuxfoundation.org> User-Agent: quilt/0.65 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 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter [ Upstream commit 294c149a209c6196c2de85f512b52ef50f519949 ] The "p" buffer is 0x4000 bytes long. B3_RI_WTO_R1 is 0x190. The value of "regs->len" is in the 1-0x4000 range. The bug here is that "regs->len - B3_RI_WTO_R1" can be a negative value which would lead to memory corruption and an abrupt crash. Fixes: c3f8be961808 ("[PATCH] skge: expand ethtool debug register dump") Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/skge.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/marvell/skge.c +++ b/drivers/net/ethernet/marvell/skge.c @@ -152,8 +152,10 @@ static void skge_get_regs(struct net_dev memset(p, 0, regs->len); memcpy_fromio(p, io, B3_RAM_ADDR); - memcpy_fromio(p + B3_RI_WTO_R1, io + B3_RI_WTO_R1, - regs->len - B3_RI_WTO_R1); + if (regs->len > B3_RI_WTO_R1) { + memcpy_fromio(p + B3_RI_WTO_R1, io + B3_RI_WTO_R1, + regs->len - B3_RI_WTO_R1); + } } /* Wake on Lan only supported on Yukon chips with rev 1 or above */