Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp666862pxb; Tue, 5 Apr 2022 18:00:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxijDLc9VJE2RuoOg5FoVMW21ZADWaNaMghIqwpz+nqdHxeo6PZZiiB6v4BCiqgu6CTPusg X-Received: by 2002:a05:6402:3044:b0:41c:d4d4:8664 with SMTP id bs4-20020a056402304400b0041cd4d48664mr6214689edb.239.1649206802253; Tue, 05 Apr 2022 18:00:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649206802; cv=none; d=google.com; s=arc-20160816; b=ulavijdCYf96XXq6vr2tR/bycK1/nXQrGSN7Qf/jVQRUkYfte4LzlInvR2T5mSEyqA IXFC9jqBgeS9KNHHZtPvIuT29ZWofe5AhtMpQsW16d0tKxdAqcBU3HjjQWC9+LDUlpkd C33+r2SP4Y1id2tq3PF9hzBWqTDttYqXOYAWv0Zo2gImHX/9FP60jsoU/4KQ34NMbTac brJxTAN2k2HjFk/v4WSjZWejiSPdd70sUO2CRXxB4+iYu9cGecqv0CD8pkt9bZcxSweI Pt9ezQKwxCravSNIiyaNW1nCcEwYvaaXS3uwZvSNdn6WR46oy8gBuNLYYVCaTkOoQKsO DR2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jjwLTCQDEv2PeC7T0wSg3jBiqSq2ea+L73qjcnexZOQ=; b=tbPBQnBIWPsjCDwoNVFMm3IFeSaHecMi6BhlWfDov16yd0ytEpdjktF6SgCixDapyv VQCyJtJmXGxERxga8sn8YoyuyHqCnf/mnyTXNw8H9tc8+g6KgWxqIVCpj1R8eG4umLrz lyU3W9vlKg52c37WI2UDknuJRp8Z+BNQ7daix/3J3fkPHLPidacfd+z6SgtjVmQA7ncG ZPOED7pHu2dG0rdjc40exSr0PgXJ5KnZUYKTL8cTOwaInT50MKwqvz6jpTGo1cXLKnaS 8JDldc6pxb/EteTLdOoth/yMlhGuGZwBtEjMsBJi6UvxnQmv8S31c2PnBbUbQo8E1vJ4 BNVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZwOkzsDk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y9-20020a50d8c9000000b00418c2b5bddcsi10940999edj.190.2022.04.05.17.59.36; Tue, 05 Apr 2022 18:00:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZwOkzsDk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343846AbiDEOyt (ORCPT + 99 others); Tue, 5 Apr 2022 10:54:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244628AbiDEJlg (ORCPT ); Tue, 5 Apr 2022 05:41:36 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28291BBE2B; Tue, 5 Apr 2022 02:27:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D21C3B81CAC; Tue, 5 Apr 2022 09:27:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 194DFC385A0; Tue, 5 Apr 2022 09:27:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649150830; bh=EIqZGIC3MEY6zK++/3lavNvUv7djR+iZn/Z4aFTomR0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZwOkzsDkdP6o6i6Ko/f+N3bhi/Ta9V6ujzLWXCKm4n0g/L/8EvaoMH07HptPCQ5Nl vEInw+VepJ+mDaVOAMdnPjrFOKZVP3PuLYaNc3IZ9rirBqPyV4mP/4Du+j5DYybEeZ K4+VhCK5wcBGSgOdw09XWGpPDIxG4FaIlmBn+6Ec= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Corentin Labbe , Herbert Xu , Sasha Levin Subject: [PATCH 5.15 196/913] crypto: authenc - Fix sleep in atomic context in decrypt_tail Date: Tue, 5 Apr 2022 09:20:58 +0200 Message-Id: <20220405070345.733437531@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070339.801210740@linuxfoundation.org> References: <20220405070339.801210740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Herbert Xu [ Upstream commit 66eae850333d639fc278d6f915c6fc01499ea893 ] The function crypto_authenc_decrypt_tail discards its flags argument and always relies on the flags from the original request when starting its sub-request. This is clearly wrong as it may cause the SLEEPABLE flag to be set when it shouldn't. Fixes: 92d95ba91772 ("crypto: authenc - Convert to new AEAD interface") Reported-by: Corentin Labbe Signed-off-by: Herbert Xu Tested-by: Corentin Labbe Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- crypto/authenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/authenc.c b/crypto/authenc.c index 670bf1a01d00..17f674a7cdff 100644 --- a/crypto/authenc.c +++ b/crypto/authenc.c @@ -253,7 +253,7 @@ static int crypto_authenc_decrypt_tail(struct aead_request *req, dst = scatterwalk_ffwd(areq_ctx->dst, req->dst, req->assoclen); skcipher_request_set_tfm(skreq, ctx->enc); - skcipher_request_set_callback(skreq, aead_request_flags(req), + skcipher_request_set_callback(skreq, flags, req->base.complete, req->base.data); skcipher_request_set_crypt(skreq, src, dst, req->cryptlen - authsize, req->iv); -- 2.34.1