Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 92449ECAAA3 for ; Fri, 26 Aug 2022 21:16:09 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A246F841F5; Fri, 26 Aug 2022 23:16:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1661548567; bh=ld+ZNgv619rH13Aal1apOaAk+mxDsEcX3yYbr4uhO7w=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=Yw1B/4r+oN6g3AF4Nex05zPAUEBCVzVdqF1E8sw0SPzpQCra/nxC6VuE9teVBqJZv CpZpBo3zJRvVpv9kY+PdeszQZgjmQzBPmjB+vO5cMPzZcQoeKLB3gJp8bSFXuDBNaM WnGY/MN/CfzIHwkxcoMDsmvJS4rCjbAwBoYRBfloZrllBLp8OYHjr/hbBuWOWASjFT 1ohY/ep271FWrKHxfxz10EsR8E/sH8tUzrgeWA6CYIb8pZK1VxpymUAWQSMIqUSIFC TXfuwMcxPXGUqfRorU7oeEgqTeCq420OC7dOiK/utDdPFl8SELfsoaBD43FiAepEgP dY+yVCtGzwq7w== Received: from tr.lan (ip-86-49-12-201.bb.vodafone.cz [86.49.12.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 7AFF7841CD; Fri, 26 Aug 2022 23:16:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1661548565; bh=ld+ZNgv619rH13Aal1apOaAk+mxDsEcX3yYbr4uhO7w=; h=From:To:Cc:Subject:Date:From; b=qgI9VxoGOHFLjp22dVqdsohhk4KWeeJlw3t7X3u/qB9eVMOcVMKIoXNj9wIB1qKvJ 8cUZLEzgV7q9Wjb84ItFY8JgFRCFEUQS2As1goqjZAmow8BpbO3g+fR02czJCla1aK j1LSoq4oLX1E6mP4KRUvKSvap6ibEMTlBhxAURamEegZNlRKP4UZ1Geo2xdsuUSLzv KUorXSx2CxA2tZPp+ntuq4akVJi62wfTrqVvnC6T5QzvaSP4qWYShycEuF34M5tAx5 cpHppeESTLJ21KeDykO3XrjE7Aw0Th9qmOD49HXX7UM7kSwFiF5MBxajAlcbdeYaIw Qr0nOSjlSAgiw== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Heiko Schocher , Nicolas Iooss , Simon Glass , Tim Harvey Subject: [PATCH 1/2] Revert "i2c: fix stack buffer overflow vulnerability in i2c md command" Date: Fri, 26 Aug 2022 23:15:55 +0200 Message-Id: <20220826211556.23100-1-marex@denx.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This reverts commit 8f8c04bf1ebbd2f72f1643e7ad9617dafa6e5409. The commit is largely wrong and breaks most of i2c command functionality. The problem described in the aforementioned commit commit message is valid, however the commit itself does many more changes unrelated to fixing that one problem it describes. Those extra changes, namely the handling of i2c device address length as unsigned instead of signed integer, breaks the expectation that address length may be negative value. The negative value is used by DM to indicate that address length of device does not change. The actual bug documented in commit 8f8c04bf1ebbd2f72f1643e7ad9617dafa6e5409 can be fixed by extra sanitization in separate patch. Signed-off-by: Marek Vasut Cc: Heiko Schocher Cc: Nicolas Iooss Cc: Simon Glass Cc: Tim Harvey --- cmd/i2c.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/i2c.c b/cmd/i2c.c index bd04b14024b..9050b2b8d27 100644 --- a/cmd/i2c.c +++ b/cmd/i2c.c @@ -200,10 +200,10 @@ void i2c_init_board(void) * * Returns the address length. */ -static uint get_alen(char *arg, uint default_len) +static uint get_alen(char *arg, int default_len) { - uint j; - uint alen; + int j; + int alen; alen = default_len; for (j = 0; j < 8; j++) { @@ -247,7 +247,7 @@ static int do_i2c_read(struct cmd_tbl *cmdtp, int flag, int argc, { uint chip; uint devaddr, length; - uint alen; + int alen; u_char *memaddr; int ret; #if CONFIG_IS_ENABLED(DM_I2C) @@ -301,7 +301,7 @@ static int do_i2c_write(struct cmd_tbl *cmdtp, int flag, int argc, { uint chip; uint devaddr, length; - uint alen; + int alen; u_char *memaddr; int ret; #if CONFIG_IS_ENABLED(DM_I2C) @@ -469,8 +469,8 @@ static int do_i2c_md(struct cmd_tbl *cmdtp, int flag, int argc, { uint chip; uint addr, length; - uint alen; - uint j, nbytes, linebytes; + int alen; + int j, nbytes, linebytes; int ret; #if CONFIG_IS_ENABLED(DM_I2C) struct udevice *dev; @@ -589,9 +589,9 @@ static int do_i2c_mw(struct cmd_tbl *cmdtp, int flag, int argc, { uint chip; ulong addr; - uint alen; + int alen; uchar byte; - uint count; + int count; int ret; #if CONFIG_IS_ENABLED(DM_I2C) struct udevice *dev; @@ -676,8 +676,8 @@ static int do_i2c_crc(struct cmd_tbl *cmdtp, int flag, int argc, { uint chip; ulong addr; - uint alen; - uint count; + int alen; + int count; uchar byte; ulong crc; ulong err; @@ -985,7 +985,7 @@ static int do_i2c_loop(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { uint chip; - uint alen; + int alen; uint addr; uint length; u_char bytes[16]; -- 2.35.1