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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 5DF7BC169C4 for ; Mon, 11 Feb 2019 15:54:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 233BD21B18 for ; Mon, 11 Feb 2019 15:54:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549900445; bh=E1EYjcnK2uMgsfARZYoFDX7xe70HqrWuT3x9RaOwRZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tEukwqjdVu9Xk8wVluhQhHEuxyiVXD5f++WgUidTCUD1fRd6E0kth0HUDAG6dnGM0 X5Wmv0EmZCO7FvR9f1nrZBstvmBc8ahWzheW0H/XhLzyB/mp/RGMGY69UGoHNd5Rn2 SnERREH+fOITVB8Qj8J38z6Hu3k8XU11jc7HQ7DY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731113AbfBKOgB (ORCPT ); Mon, 11 Feb 2019 09:36:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:44868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731138AbfBKOgA (ORCPT ); Mon, 11 Feb 2019 09:36:00 -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 425D32080F; Mon, 11 Feb 2019 14:35:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895759; bh=E1EYjcnK2uMgsfARZYoFDX7xe70HqrWuT3x9RaOwRZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tlvfRiprk8sw+OQwi2oQFTsm9QAgN83VPAJ2U43PcE46Y+hksTBp4ipeQUyx1vu+P 8GpEhTRmMFIaUZ8/2p1r4opYAGPDHqiJyFT1TQKvecGFMQTVYF1zm2FvYV/A9/zD7A baWJHaD8zc1x0i7xK358fOJfP1ywo3CF3hWM4yN4= 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.20 306/352] skge: potential memory corruption in skge_get_regs() Date: Mon, 11 Feb 2019 15:18:53 +0100 Message-Id: <20190211141906.338421225@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-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 */