From patchwork Tue Jun 23 19:58:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223329 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=-7.0 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=ham 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 D42CFC433E1 for ; Tue, 23 Jun 2020 20:56:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A5D5420738 for ; Tue, 23 Jun 2020 20:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945795; bh=DKXlsBCTmi+G4g/W7Tcdy0td3xC/cjRZok4Bvjuy99g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Is4FO/+7FSjJSHXKpWV7TxTYuHKk/Rs7RVu0dJcr0C7SGFNiX4c6EpQjepZHxm85B FYLPav1QpKSDd8Ouv97YmIAYoEvkQeZHHAwtTpiR57YbpV+95ueyeFTVGaVL5K6ZWv QdjiJ5FYqx6P6Ss+ckPUqgnVv3/g5S4sLltuNANI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392554AbgFWU4e (ORCPT ); Tue, 23 Jun 2020 16:56:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:40364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392530AbgFWUn2 (ORCPT ); Tue, 23 Jun 2020 16:43:28 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 750B721941; Tue, 23 Jun 2020 20:43:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945009; bh=DKXlsBCTmi+G4g/W7Tcdy0td3xC/cjRZok4Bvjuy99g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sj6gcohO1aO2rTY7s6NuMlvMPdp9L9qYCUbX+FbO0801+MN3BP3jQjodV2PBLUZW0 ifJiTWLezFKKIMkEE7Q1VV0C+ov+pHLRG7NgT5LVoKg/DMnoFu2M76lD1dDdeIrfwl fHt/KbA2yakyTXSdDePgG49qdgO+YkV56K1F+YgE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Herbert Xu , Stephan Mueller Subject: [PATCH 4.19 198/206] crypto: algif_skcipher - Cap recv SG list at ctx->used Date: Tue, 23 Jun 2020 21:58:46 +0200 Message-Id: <20200623195326.773395637@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195316.864547658@linuxfoundation.org> References: <20200623195316.864547658@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Herbert Xu commit 7cf81954705b7e5b057f7dc39a7ded54422ab6e1 upstream. Somewhere along the line the cap on the SG list length for receive was lost. This patch restores it and removes the subsequent test which is now redundant. Fixes: 2d97591ef43d ("crypto: af_alg - consolidation of...") Cc: Signed-off-by: Herbert Xu Reviewed-by: Stephan Mueller Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- crypto/algif_skcipher.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -78,14 +78,10 @@ static int _skcipher_recvmsg(struct sock return PTR_ERR(areq); /* convert iovecs of output buffers into RX SGL */ - err = af_alg_get_rsgl(sk, msg, flags, areq, -1, &len); + err = af_alg_get_rsgl(sk, msg, flags, areq, ctx->used, &len); if (err) goto free; - /* Process only as much RX buffers for which we have TX data */ - if (len > ctx->used) - len = ctx->used; - /* * If more buffers are to be expected to be processed, process only * full block size buffers.