From patchwork Sun Aug 26 23:13:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 962310 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="r3pL8pJP"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41zDMP21R0z9ryn for ; Mon, 27 Aug 2018 11:10:09 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 08FCEC21E45; Mon, 27 Aug 2018 01:09:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B641CC21E13; Mon, 27 Aug 2018 01:08:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3736AC21E15; Sun, 26 Aug 2018 23:16:44 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id EF95AC21DD9 for ; Sun, 26 Aug 2018 23:16:40 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id v17-v6so11883319wrr.9 for ; Sun, 26 Aug 2018 16:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NhKS8g8/TZkc6fQhUY2eIr0PHkAUUI71lytV12SRdEE=; b=r3pL8pJPTSWlkY+vjvhYnC+Q5QXTnWal28TxdG3xP7d3AB8exOR511uvHwaErERiQ0 HFZrwA/rEgSwR4Nq1C23Z0N44xByuohauflF8wDWoPYiRD9ZlZYjhYJIb6SekbLm//do 878FAVOqqyQ2dnHuYidP4lh88FcfvqiGAprjOp/UiAogMt0r6ipZx1hmtQauMPoNTK/W CztEbja+ZWB2MazMkMg278SQilAWdakjLGo/oyw2NMbyOmszNkTiMVjcqnO5QGYlR7QR IZs9/ng9HiuWQJxWRkdmUcSXMOQ0GBIlK5sSxPjhdx4ZsNDfk6yPZCa8fsxabzlaeLxu JPzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NhKS8g8/TZkc6fQhUY2eIr0PHkAUUI71lytV12SRdEE=; b=JEI7Or08p79Z2C3YfpycSkQl+Ly6bCglhdhoNJmn3TdBgqVcStcvwlFkQI9+wCaSVs HKtE5nLqF/NRZWwM/jvtpS2E4tgss3FxMW70GhRJgRLwog1g3QVMl/u+zL6GZ0kKw0aj 3rk3l/RXQMZGIydol6GwfGri6SNjs6UBNa9lL2owcwzJ8UeFidk2CX1b8x4jMHrx0dWn EVIeiGGxO0bg9lAw5f7F6BBE+eRtTPmzKeyaSFdnMHLOYwzwf3MwZQLA9CEDm47EwoS7 IwwDpbpXH0llxKM7PzjcYSYnaFJcXQBjoSGXcONGbvgKWVv93+fzFSaotybY9jAEM/8e SDfA== X-Gm-Message-State: APzg51B7iLk+aPqzaBYX+g/Rvs3jxir47mFL2gKJgSS4UjEzsEiYooa7 yRfrpgJEfT/AbvDsc1yl8Mk= X-Google-Smtp-Source: ANB0VdaHrzQ0se0mG+PDTSW3UXGib5VL3ZEwejvETiQ2kX2TtE1V/TUfGfPAbXQFUsEhjdN/abVKkg== X-Received: by 2002:adf:c98d:: with SMTP id f13-v6mr7261324wrh.148.1535325400668; Sun, 26 Aug 2018 16:16:40 -0700 (PDT) Received: from localhost.localdomain (ipb218f467.dynamic.kabel-deutschland.de. [178.24.244.103]) by smtp.gmail.com with ESMTPSA id e141-v6sm10828362wmd.32.2018.08.26.16.16.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Aug 2018 16:16:39 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Tom Rini , u-boot@lists.denx.de Date: Mon, 27 Aug 2018 01:13:28 +0200 Message-Id: <20180826231332.2491-11-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180826231332.2491-1-erosca@de.adit-jv.com> References: <20180826231332.2491-1-erosca@de.adit-jv.com> X-Mailman-Approved-At: Mon, 27 Aug 2018 01:08:10 +0000 Cc: Baruch Siach , Michal Simek , Eugeniu Rosca , Suniel Mahesh , Vipul Kumar , Stephen Warren , eil Eilmsteiner Heribert , Karthik Tummala , Kishon Vijay Abraham I , Eugeniu Rosca , Guillaume GARDET , Jonathan Gray Subject: [U-Boot] [PATCH v2 10/13] mmc: Fix read-past-end-of-array X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Running "mmc dev 0" on R-Car H3 Salvator-X (CONFIG_UBSAN=y) occasionally results in: => mmc dev 0 ================================================================= UBSAN: Undefined behaviour in drivers/mmc/mmc.c:2233:14 index 7 is out of range for type 'int [4]' ================================================================= Currently, fbase[] array consists of 4 elements: -------8<------- static const int fbase[] = { 10000, 100000, 1000000, 10000000, }; -------8<------- Adjust the mask used to compute the fbase[] index accordingly. Fixes: 272cc70b211e ("Add MMC Framework") Signed-off-by: Eugeniu Rosca --- Changes in v2: - Shorten the summary line --- drivers/mmc/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 447519f46f15..01da99edb084 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2230,7 +2230,7 @@ static int mmc_startup(struct mmc *mmc) } /* divide frequency by 10, since the mults are 10x bigger */ - freq = fbase[(cmd.response[0] & 0x7)]; + freq = fbase[(cmd.response[0] & 0x3)]; mult = multipliers[((cmd.response[0] >> 3) & 0xf)]; mmc->legacy_speed = freq * mult;