From nobody Fri Apr 3 00:51:46 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D71A8C6FA86 for ; Mon, 19 Sep 2022 07:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229877AbiISHwX (ORCPT ); Mon, 19 Sep 2022 03:52:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229473AbiISHwV (ORCPT ); Mon, 19 Sep 2022 03:52:21 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE23F1C133 for ; Mon, 19 Sep 2022 00:52:19 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id q3so26972433pjg.3 for ; Mon, 19 Sep 2022 00:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=GTvbctvJNpJ5XFFAVjSyyK1oKWoGjmVgAKwPqHF7qTs=; b=rdAsr8pAkyV2pMx5d7GRQyk06KkZ4Hl2uYy+U8EVqK3K7MWt1wweat9xR1Ybh0GWYV TwXknqO5sbScM+BCarzDqQy2sYFoDQsUJzzWD6WXKzhZG/8wCZNbBQ3gADIokGuy/L+s H627sQXoPjtP1knfrxVoMpzaZKqiz3m20HU1M0EQjNdwekGUE6PS/HaEZXvHIXkG3qVV R8gQXMlRmqazLH8g6MjItsKliJLABLWrj4/qm3nZPyMjJtcCVfsviBAU0IDnk2xAHGG2 Ytmsvb4rX9ybTzR89rEc89TRK05tIfLLSjRhczrBGOP2a/i3gf4e91BMbGiPSw/TVg4v SzCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=GTvbctvJNpJ5XFFAVjSyyK1oKWoGjmVgAKwPqHF7qTs=; b=u5FlLwsohEJEh/nCwhYf6x3pjUQTScDSlGvr6oYrF6nH584okXV0cZWVbmhbCQye8d LjHd3Vyz4jq+RTstmJ1JsZw4wxwIHbtNp9mnZzMqzF3dMrqvAxFYgRhgk5aXEMpCusZF j7MvoGP3GVMBryhHiFTmJfMaOjms76UpPddqnHVEMPOLHjp5tyswYmfxLKcF6yzAOUep K4mPou+Y6KUPLidxYxziD6lSe/0s2RSw94Lnk//xKGDZc2m9SOu/wSB20D7XnBCOmKay 4dd7fuMvHXgjRP7bSJnYluGXMPCK/8qdd8lR4y26+K7EMdfcbCligQkhW4u0KBlwA105 iK/g== X-Gm-Message-State: ACrzQf0NFpvKmqcj1CYoxLKJPXx0FJ0p5S/0tbc1p9WCFXH72aXaLazK bC1Xx7AhzbYuX2oBvNG8csouSQ== X-Google-Smtp-Source: AMsMyM643hgxLdb849WmJ4RhvZd9n5dCyv1lNXdROrTk43OBSVJLtSsqY08dfcqilV8P5C+JfdYxOw== X-Received: by 2002:a17:90b:1e47:b0:200:b9b4:ba1e with SMTP id pi7-20020a17090b1e4700b00200b9b4ba1emr19166426pjb.172.1663573939338; Mon, 19 Sep 2022 00:52:19 -0700 (PDT) Received: from FVFDK26JP3YV.bytedance.net ([139.177.225.253]) by smtp.gmail.com with ESMTPSA id k12-20020a65434c000000b00438e0db80dasm15339950pgq.65.2022.09.19.00.52.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Sep 2022 00:52:18 -0700 (PDT) From: Lei He To: herbert@gondor.apana.org.au Cc: mst@redhat.com, arei.gonglei@huawei.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, pizhenwei@bytedance.com, lei he Subject: [PATCH v2 RESEND] virtio-crypto: fix memory-leak Date: Mon, 19 Sep 2022 15:51:58 +0800 Message-Id: <20220919075158.3625-1-helei.sig11@bytedance.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: lei he Fix memory-leak for virtio-crypto akcipher request, this problem is introduced by 59ca6c93387d3(virtio-crypto: implement RSA algorithm). The leak can be reproduced and tested with the following script inside virtual machine: #!/bin/bash LOOP_TIMES=3D10000 # required module: pkcs8_key_parser, virtio_crypto modprobe pkcs8_key_parser # if CONFIG_PKCS8_PRIVATE_KEY_PARSER=3Dm modprobe virtio_crypto # if CONFIG_CRYPTO_DEV_VIRTIO=3Dm rm -rf /tmp/data dd if=3D/dev/random of=3D/tmp/data count=3D1 bs=3D230 # generate private key and self-signed cert openssl req -nodes -x509 -newkey rsa:2048 -keyout key.pem \ -outform der -out cert.der \ -subj "/C=3DCN/ST=3DGD/L=3DSZ/O=3Dvihoo/OU=3Ddev/CN=3Dalways.com/emailAdd= ress=3Dyy@always.com" # convert private key from pem to der openssl pkcs8 -in key.pem -topk8 -nocrypt -outform DER -out key.der # add key PRIV_KEY_ID=3D`cat key.der | keyctl padd asymmetric test_priv_key @s` echo "priv key id =3D "$PRIV_KEY_ID PUB_KEY_ID=3D`cat cert.der | keyctl padd asymmetric test_pub_key @s` echo "pub key id =3D "$PUB_KEY_ID # query key keyctl pkey_query $PRIV_KEY_ID 0 keyctl pkey_query $PUB_KEY_ID 0 # here we only run pkey_encrypt becasuse it is the fastest interface function bench_pub() { keyctl pkey_encrypt $PUB_KEY_ID 0 /tmp/data enc=3Dpkcs1 >/tmp/enc.pub } # do bench_pub in loop to obtain the memory leak for (( i =3D 0; i < ${LOOP_TIMES}; ++i )); do bench_pub done Signed-off-by: lei he Acked-by: Michael S. Tsirkin Reviewed-by: Gonglei --- drivers/crypto/virtio/virtio_crypto_akcipher_algs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c b/drivers/= crypto/virtio/virtio_crypto_akcipher_algs.c index 2a60d0525cde..168195672e2e 100644 --- a/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c +++ b/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c @@ -56,6 +56,10 @@ static void virtio_crypto_akcipher_finalize_req( struct virtio_crypto_akcipher_request *vc_akcipher_req, struct akcipher_request *req, int err) { + kfree(vc_akcipher_req->src_buf); + kfree(vc_akcipher_req->dst_buf); + vc_akcipher_req->src_buf =3D NULL; + vc_akcipher_req->dst_buf =3D NULL; virtcrypto_clear_request(&vc_akcipher_req->base); =20 crypto_finalize_akcipher_request(vc_akcipher_req->base.dataq->engine, req= , err); base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 --=20 2.20.1