From patchwork Thu Dec 8 08:23:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 9465979 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 29BA960231 for ; Thu, 8 Dec 2016 08:24:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19AFC28509 for ; Thu, 8 Dec 2016 08:24:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E73328534; Thu, 8 Dec 2016 08:24:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17BF228509 for ; Thu, 8 Dec 2016 08:24:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750851AbcLHIYB (ORCPT ); Thu, 8 Dec 2016 03:24:01 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35452 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750729AbcLHIYB (ORCPT ); Thu, 8 Dec 2016 03:24:01 -0500 Received: by mail-wm0-f51.google.com with SMTP id a197so205463107wmd.0 for ; Thu, 08 Dec 2016 00:24:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=+CI762looPUIQgvMFtJBHvNqStWpWzRcR/9D//XD9P0=; b=RdYSDg8CDEApNbchYG44yDTiStwq8UzTBibT2UOoC3K83OCn7I16kotg+bbx8kxG3m J+4Cq+HUpz0VC7u5wvWjurWh34YPxU/dAOIbwDa2+2bmHVQ4Mjr0MolAeq6z+OOLF903 4UeMvYJC03rk8l0z5P5nKe9V0XWrsEISR73j4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+CI762looPUIQgvMFtJBHvNqStWpWzRcR/9D//XD9P0=; b=ZMHwIeKOlqZiUThJUjTPiBPjTu9W+ordU0EU6lSwWoE3Suy+SlDN6JfhCQStwGP5QT mpnJrzsGBBRh8px3vzSrKCWtfJ8Y/xsPSbe2mnARHQkscarEBByir87MVaBIOh07Z0mS lSyZHd+C8IfJW3y67r6/PiCv63FcvwRtMPyDZhIIZJhMqtWmG3NaSgrp/dil99588HUf 0L226M2dXuEhe7gPHc5De4zlm0gqhvT56WcavVhOvukQnHi1hVwTjlFvkzpq42orHLkN t4vKJyDAVYOPzFoxkUbG+d/kp1TIg109Hhhnhg0zi+cgMG6mWsljWqZXdLiigx3XtPIu ZdQQ== X-Gm-Message-State: AKaTC02SFzmAMT2z7NLO6FIVx9pGkkLHqBJwfKAOc3AaCZLVS5sfLjj7KwRleuhZY6z8ksgm X-Received: by 10.28.54.216 with SMTP id y85mr1028818wmh.85.1481185439924; Thu, 08 Dec 2016 00:23:59 -0800 (PST) Received: from localhost.localdomain ([105.144.52.243]) by smtp.gmail.com with ESMTPSA id z6sm35670520wjt.24.2016.12.08.00.23.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Dec 2016 00:23:58 -0800 (PST) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au Cc: ebiggers@google.com, Ard Biesheuvel Subject: [PATCH] crypto: testmgr - fix overlap in chunked tests again Date: Thu, 8 Dec 2016 08:23:52 +0000 Message-Id: <1481185432-24761-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 7e4c7f17cde2 ("crypto: testmgr - avoid overlap in chunked tests") attempted to address a problem in the crypto testmgr code where chunked test cases are copied to memory in a way that results in overlap. However, the fix recreated the exact same issue for other chunked tests, by putting IDX3 within 492 bytes of IDX1, which causes overlap if the first chunk exceeds 492 bytes, which is the case for at least one of the xts(aes) test cases. So increase IDX3 by another 1000 bytes. Signed-off-by: Ard Biesheuvel --- crypto/testmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 670893bcf361..157a415097f2 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -63,7 +63,7 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) */ #define IDX1 32 #define IDX2 32400 -#define IDX3 511 +#define IDX3 1511 #define IDX4 8193 #define IDX5 22222 #define IDX6 17101