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=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 824A3C4338F for ; Tue, 3 Aug 2021 14:29:44 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E88A260EFD for ; Tue, 3 Aug 2021 14:29:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E88A260EFD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D67CC82DCE; Tue, 3 Aug 2021 16:29:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="WAjwJx0s"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 35D0982DD7; Tue, 3 Aug 2021 16:29:27 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3756D82039 for ; Tue, 3 Aug 2021 16:29:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 829DD60BD3; Tue, 3 Aug 2021 14:29:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628000962; bh=/B0j2KfiR0xbR7uOnVIl7uLp80xtelxtNbVPlvGE0D8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WAjwJx0sEMHrJa4gnZFUnt7UUodwEqOuh3ZRwxExUFffuKvolUK/ihqF3QPlewHAZ LBaaCCMebnLRP1X6hChU+nVcCYmHst1aWgPBww0G+twCXMeLOKDlB0yc7MkCkHPP5R GUHz/6x5hqItzf1jFQWK5Vo5d5usxylDQYAFLEP/h8oehDakjJhO9lktt8KM6/3AvG juwwiJUXQXufmF2YgfWFXDohPzzB8gb6TXjupKp6kdSDgPmKRyzGrjD7S3w1prXfo/ g6vWJDXVtXIeCXFCzDOxyVC9D3KMQnAYhPopXpgU4Vm4MUa7q3dqalz61Ao3mm4UtU LqUulNPROSs1A== Received: by pali.im (Postfix) id 99C3F942; Tue, 3 Aug 2021 16:29:20 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Simon Glass , Heinrich Schuchardt , Michal Simek , =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: u-boot@lists.denx.de Subject: [PATCH 1/7] xyz-modem: Fix crash after cancelling transfer Date: Tue, 3 Aug 2021 16:28:38 +0200 Message-Id: <20210803142844.19455-2-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210803142844.19455-1-pali@kernel.org> References: <20210803142844.19455-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean Variable xyz.len is set to -1 on error. At the end xyzModem_stream_read() function calls memcpy() with length from variable xyz.len. If this variable is set to -1 then value passed to memcpy is casted to unsigned value, which means to copy whole address space. Which then cause U-Boot crash. E.g. on arm64 it cause CPU crash: "Synchronous Abort" handler, esr 0x96000006 Fix this issue by checking that value stored in xyz.len is valid prior trying to use it. Signed-off-by: Pali Rohár --- common/xyzModem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/xyzModem.c b/common/xyzModem.c index fc3459ebbafe..b1b72aae0baf 100644 --- a/common/xyzModem.c +++ b/common/xyzModem.c @@ -494,7 +494,7 @@ xyzModem_stream_read (char *buf, int size, int *err) total = 0; stat = xyzModem_cancel; /* Try and get 'size' bytes into the buffer */ - while (!xyz.at_eof && (size > 0)) + while (!xyz.at_eof && xyz.len >= 0 && (size > 0)) { if (xyz.len == 0) { @@ -587,7 +587,7 @@ xyzModem_stream_read (char *buf, int size, int *err) } } /* Don't "read" data from the EOF protocol package */ - if (!xyz.at_eof) + if (!xyz.at_eof && xyz.len > 0) { len = xyz.len; if (size < len) -- 2.20.1