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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 470BBC2BA83 for ; Thu, 13 Feb 2020 15:38:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1F61C2073C for ; Thu, 13 Feb 2020 15:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581608325; bh=dHeL7CXV9VZmIwpyozwNJgQsEYNVcPDI375P/GphZS8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hsYKhp4UlQqLnZwu9cTtnnYSq64VSaH09VznXFWPLxAI8ijjxcftMQv0+vxhh5+jk 2cIWEMQjrRgsMPduHQvzX1NYiw7GpTl1r/5ByJzKVqp1kvkAp5qCBwaRf6UaxLL3Hp LfI3NZn1DhjyU8jnC6RzzMMDVuKdUb/HCzwLPOg8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729488AbgBMPig (ORCPT ); Thu, 13 Feb 2020 10:38:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:59234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729681AbgBMP3M (ORCPT ); Thu, 13 Feb 2020 10:29:12 -0500 Received: from localhost (unknown [104.132.1.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 571EA24670; Thu, 13 Feb 2020 15:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607752; bh=dHeL7CXV9VZmIwpyozwNJgQsEYNVcPDI375P/GphZS8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O7id/n/caYU4kpKbyRpEzebwD+eJeYfXRmSY4q3KDc/Lo6H685cZAITt5cly0ufau RDu1DG07FERyGRoM/z8xyfdesCUGjrq1SS5V9JoGZRK929nAXKKHoYpTnqsNfI94VQ 1r4JFxytS4owOldJECALgCtvmQCNj1u6dc5QHGZ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jesper Nilsson , Lars Persson , Eric Biggers , Herbert Xu Subject: [PATCH 5.5 096/120] crypto: artpec6 - return correct error code for failed setkey() Date: Thu, 13 Feb 2020 07:21:32 -0800 Message-Id: <20200213151933.339239596@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151901.039700531@linuxfoundation.org> References: <20200213151901.039700531@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric Biggers commit b828f905904cd76424230c69741a4cabb0174168 upstream. ->setkey() is supposed to retun -EINVAL for invalid key lengths, not -1. Fixes: a21eb94fc4d3 ("crypto: axis - add ARTPEC-6/7 crypto accelerator driver") Cc: Jesper Nilsson Cc: Lars Persson Signed-off-by: Eric Biggers Acked-by: Lars Persson Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/axis/artpec6_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/crypto/axis/artpec6_crypto.c +++ b/drivers/crypto/axis/artpec6_crypto.c @@ -1251,7 +1251,7 @@ static int artpec6_crypto_aead_set_key(s if (len != 16 && len != 24 && len != 32) { crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN); - return -1; + return -EINVAL; } ctx->key_length = len;