From patchwork Sun Sep 30 19:51:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 147865 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3139470lji; Sun, 30 Sep 2018 12:51:28 -0700 (PDT) X-Google-Smtp-Source: ACcGV618oH7hXwkKC74xGpqfbwubN3fNDAxsui3s+atorEq4cuB6GlGB+7VhoPP+ZczTWZmSpjmD X-Received: by 2002:aa7:86cc:: with SMTP id h12-v6mr2073055pfo.58.1538337087933; Sun, 30 Sep 2018 12:51:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538337087; cv=none; d=google.com; s=arc-20160816; b=nKElXSt/j3C7oj/jh36C7YoIUmjwKxY5qotSMmth9wYvlQIi3ElI348ckJ1/31yTXZ ZK0BCbm1OEFj+lcwWBOBeGkErhE8dODH37hwNLz3snMLqQgXgfVHIs0GFulLeXONmpVU 1lzevHKn9K55d5AN7LcvEaewSg7ReldfPbaJV7CC5ltOH0B2NKid/grwDta0DWAKyoYq 107BAXhRkNHyfQ5JYKxCM9M26VSXRZzvydvQsOJ2U4dnwhsOC+aPL0oZIVGPc6187xBc NbJGZtxxtkY0hOdqMtlde1EfaT47n4G4aw04bzsxzWCbSrmi5Vh978TcVkR4StjOtDbf pxOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=Ngo5slU+TD8pvrgy5iT3tSDW4YaXasb5LD684v8luYY=; b=LCycXKUdAUSB9QyleUh875uALZ3z4nCU8VUei757jsRSknpLDTtGj3BwX8GdToWmnD KAs6ZepZXn2QmWF66t7K+fPZb+yaN0ALvPPJO4FPfIgNCJEvOzIwfph6OVPdEEvyWSMi AT9kZo4x4kTXr02CTaCipeH9a/CDf81hu4a41CZLqwi+pzTjstrM0ZZmEsDSsVksSOAv SkbHsqzmYDtK1sMkF4uMM480KvDX8Enz7+zGXcXLu9C7YIMpttgBz3qZKRsUPFxkeAJ5 4AeL8peUwSx4Q9LOoibjDxuIY8/qOMbgLXN+q+heYCR4Mgjo2Y9Pls3gjSsT9FapzFs5 d+vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e7Vi37Ed; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j12-v6si10054014pgb.328.2018.09.30.12.51.27; Sun, 30 Sep 2018 12:51:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e7Vi37Ed; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728509AbeJACZp (ORCPT + 2 others); Sun, 30 Sep 2018 22:25:45 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:37030 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728507AbeJACZp (ORCPT ); Sun, 30 Sep 2018 22:25:45 -0400 Received: by mail-wr1-f65.google.com with SMTP id u12-v6so11487356wrr.4 for ; Sun, 30 Sep 2018 12:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Ngo5slU+TD8pvrgy5iT3tSDW4YaXasb5LD684v8luYY=; b=e7Vi37EdeS5O2sGBAVd1xdShaY1J7R2OahEX+cKvghetxg7vZhmZbllS/Py76AVEEG 7uiRJr6FGGZM9CydSN08mz13ua3/om4hTT+NmGNP/AJINmuwyNIr1F2c2rh0ca01n/+i vRUCr1sXQ/0slolZeyGcg4VjW4NsHvizQnXGA= 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; bh=Ngo5slU+TD8pvrgy5iT3tSDW4YaXasb5LD684v8luYY=; b=e95eh7v0FGPSjlH8SP0O7FHQbukBT2EUkkO98F3GDUVVZYU/3EkeGefRP4gH9L/kbg C4TN0K8z5GsWfHIvSF9yQLGgkTKXOZFEApjU3bxDogupE7dwfxnYcGx+ZriYy1HBEy3s i4UXarUIWLyjvJ05mnGOv8TMOKPyI/QSgT0jJqIMiC1TL5ONEAvXsfrNg9AuC+fQIkWL dVstwyi+2RYOm1DlVv/lqcjmoZNrilK7sWfg92823oXZJms0mH6QNuZM4HN6kwlKRqRr 5s3VYdC6dWsChJOe9LeZp/XNZGFOkKKjNrwq0VDjU9MmxrZQP4nct0DT2MzNVzAVdwOc 7g6g== X-Gm-Message-State: ABuFfojWml9QXMGfds/aPrIHZpqFXVyI4Iwh+CSYFqkJKMi6n0cp5COP ig76b2Qvlc3sEk5j7RWHm4dVV8PdzC4= X-Received: by 2002:a5d:6a11:: with SMTP id m17-v6mr292589wru.192.1538337084588; Sun, 30 Sep 2018 12:51:24 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:6d26:fb49:4a42:a358]) by smtp.gmail.com with ESMTPSA id j133-v6sm9027783wmd.12.2018.09.30.12.51.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 12:51:23 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@google.com, omosnace@redhat.com, Ard Biesheuvel Subject: [PATCH] crypto: lrw - fix rebase error after out of bounds fix Date: Sun, 30 Sep 2018 21:51:16 +0200 Message-Id: <20180930195116.31658-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Due to an unfortunate interaction between commit fbe1a850b3b1 ("crypto: lrw - Fix out-of bounds access on counter overflow") and commit c778f96bf347 ("crypto: lrw - Optimize tweak computation"), we ended up with a version of next_index() that always returns 127. Fixes: c778f96bf347 ("crypto: lrw - Optimize tweak computation") Signed-off-by: Ard Biesheuvel --- crypto/lrw.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.17.1 Reviewed-by: Ondrej Mosnacek diff --git a/crypto/lrw.c b/crypto/lrw.c index 6fcf0d431185..0430ccd08728 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -122,10 +122,9 @@ static int next_index(u32 *counter) int i, res = 0; for (i = 0; i < 4; i++) { - if (counter[i] + 1 != 0) { - res += ffz(counter[i]++); - break; - } + if (counter[i] + 1 != 0) + return res + ffz(counter[i]++); + counter[i] = 0; res += 32; }