From patchwork Tue Sep 8 10:29:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1359658 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=d01XjGXr; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bm1cW44cmz9sSn for ; Tue, 8 Sep 2020 20:30:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 41FA4824D9; Tue, 8 Sep 2020 12:29:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="d01XjGXr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 87F2A824EA; Tue, 8 Sep 2020 12:29:56 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2DA70824B3 for ; Tue, 8 Sep 2020 12:29:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1599560990; bh=8eWVFd/N2orBTuia0ysASdZdUSyUDY39F3O/E1PtnuY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=d01XjGXrvlxdPPviZRFPoxPWOsxF9xT0snLk6yJYJRvJqAFFFVWhj7mTMM1B5+98Q zUuChb2QGjhnTnP6e1hDG0eUsCiboin1Hbhnt3GsGSwk7sxx2edsHyZu2pkPGi3On0 gG6fIxdAKf6dDillq2xYwdzVmD5xcws1XS+eKsH0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from rpi2.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N9MpY-1kaZiM0Km4-015JIH; Tue, 08 Sep 2020 12:29:50 +0200 From: Heinrich Schuchardt To: Tom Rini Cc: AKASHI Takahiro , u-boot@lists.denx.de, Heiko Stuebner , Simon Glass , Heinrich Schuchardt Subject: [PATCH 1/1] lib: rsa: fix data abort in br_i32_decode() Date: Tue, 8 Sep 2020 10:29:36 +0000 Message-Id: <20200908102936.16366-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:0nplioU60tMINMmOt7EILeVVz5/PFduerJCniHD5AKplT58lMUa XxwolzxS3EVkrk54DAgWMwW6lIAVoQss/KGXk2huWD1cv4/cqlH4lqwlUDD9rORbZBec7p6 l/78CE+R2qXvi7XeTRpkRqQv9JDLYX03WNGWmLi5n/vp0dvgHrVUkPAYS/DUcpppVj3xnX5 HMmcWWB2cBN0NzhXNUVUA== X-UI-Out-Filterresults: notjunk:1;V03:K0:nf8LsuDHEMc=:E0pvkIldnlk094ynmL3X04 hdkLwutMk5Wive8k8VedZlaUtGH26ptkr9IRwTwwpElqblMth6vk/yZWZfrQ88Mdvkn1wDNtQ zLML4kDgwgKNTZZr/iWm0ET1lvwKyixFq1jN6zU+M2kV8boNzsAWA0Bw9V3wDvPxSYpnwR7rz bpwa8pTzeVDTthJ4LzA084jyGawmJ9dogeqhQQDSipQITIfuh+7LADQbh4vZj2xkPK3PjjDOW B6rXFw7Ccgx7mgZzdpH0Mwh0rIXz1s6GtBZbQU3isLvs+/uQJgDdo1PBrEmmVZ9VXYC+fEPAq 6e8RuRPlE3cePjlcQrLxpevL9aBY1I1QBxtuPNID50t9194qUPHhroxcK6DSB12nt6hs9k4sp H1D560VkSCPORPj+62H+JeqkjUEcsU3qRAI+TbX6p76RMrxanitP9OKiUgez/5jZzEy5ispFm 1+oY7em7gv350NjnMrBcaAY9yghiUSk5Bu4DS1t76GEkTgNeoVC5jctHpqr+e1q5uV4cIWE5l n3512w2tfRr9oSzTgch8ApxhM0azzw/a2kAtw1cvdvVFyECq8ty/nJxjO5tZwnN8LUcIyFraQ h8brW9pIUsFgy9qnVjnT0EFknoPwOhvwTNk7NslAyPM/ypUnr4BCOt1L5xuOM/HqUs/bv98/7 lK3aIq17/Z3Z/SZ5WIVUL4/MJysp/B7cws1ZsFvmcnqy3wL6ZVuXY/rmnPJs+OXQfFaug25sK 0nyyeJDw+a6JIiZleBZ0UEA/p3EbCusmUUVu/NONmMutYel3d/VFRLP1FNVhIQrIelQ6J0qiD 3XXmd1kI9RHO+PbHF0SHCWlieHHafKDseeF3NZzzpdsJXlORqHdCebx0b3qVsUBMZsxpjSrs3 ZYfkSk6q70Ogp8wbjMggHZwzTz8G5WESMUWMaHWx920wy0a/j35kyZ83pF3pnChd2u6nextdF 8UL9a14nO62DFPDCwGIGqDHB4vozqdjjKAP1rkyEhinXFMgSW3RQbm+vnRjWqgVBfxur8X9ye QI96PhYbfahrBUhK8VRM1v9snfZhPFT+DjwRO/nahRgsiqzdgHj5ulLH7MMo+f9wcVP/hFtXz D0xwnNsXl0FCgNjKzcym06ViOqe89Fru+MM3Oa5DCuM9JIMtl8m7DLydN6MqaJlb/XH6DD42r PMDGbm3gIqQCHsB0f7YKiv+RCiXRftEc1mg7dn1bSKXe0CscpYmn32bbZRCDnYm1NKz2/A+xe rkji0bBrGvYzb7/UdWboeiRav+hN27jKks7nllw== 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.102.3 at phobos.denx.de X-Virus-Status: Clean After removing leading zeros the RSA modulus may be unaligned. On architectures like ARM 32bit unaligned access may lead to a data abort, e.g. when executing 'ut lib lib_asn1_pkcs7'. Use memcpy() to transfer from unaligned to aligned memory. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- lib/rsa/rsa-keyprop.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/lib/rsa/rsa-keyprop.c b/lib/rsa/rsa-keyprop.c index 1e83eedc82..6153cb00b3 100644 --- a/lib/rsa/rsa-keyprop.c +++ b/lib/rsa/rsa-keyprop.c @@ -17,23 +17,29 @@ #include /** - * br_dec16be() - Convert 16-bit big-endian integer to native - * @src: Pointer to data - * Return: Native-endian integer + * br_dec16be() - convert unaligned 16-bit big-endian integer to native + * @src: unaligned pointer to data + * Return: native-endian 16-bit integer */ static unsigned br_dec16be(const void *src) { - return be16_to_cpup(src); + u16 buf; + + memcpy(&buf, src, sizeof(buf)); + return be16_to_cpu(buf); } /** - * br_dec32be() - Convert 32-bit big-endian integer to native - * @src: Pointer to data - * Return: Native-endian integer + * br_dec32be() - convert unaligned 32-bit big-endian integer to native + * @src: unaligned pointer to data + * Return: native-endian 32-bit integer */ static uint32_t br_dec32be(const void *src) { - return be32_to_cpup(src); + u32 buf; + + memcpy(&buf, src, sizeof(buf)); + return be32_to_cpu(buf); } /**