{"id":2231527,"url":"http://patchwork.ozlabs.org/api/patches/2231527/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/2b5a6517789ad618f2b1c7729520e8b69659ef83.1777576834.git.massimiliano.pellizzer@canonical.com/","project":{"id":15,"url":"http://patchwork.ozlabs.org/api/projects/15/?format=json","name":"Ubuntu Kernel","link_name":"ubuntu-kernel","list_id":"kernel-team.lists.ubuntu.com","list_email":"kernel-team@lists.ubuntu.com","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<2b5a6517789ad618f2b1c7729520e8b69659ef83.1777576834.git.massimiliano.pellizzer@canonical.com>","list_archive_url":null,"date":"2026-04-30T19:28:16","name":"[SRU,N,v2,5/9] crypto: authenc - use memcpy_sglist() instead of null skcipher","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a15fc792ce918e09247744bec87f96b8dd9d86ee","submitter":{"id":89057,"url":"http://patchwork.ozlabs.org/api/people/89057/?format=json","name":"Massimiliano Pellizzer","email":"massimiliano.pellizzer@canonical.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/2b5a6517789ad618f2b1c7729520e8b69659ef83.1777576834.git.massimiliano.pellizzer@canonical.com/mbox/","series":[{"id":502367,"url":"http://patchwork.ozlabs.org/api/series/502367/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/list/?series=502367","date":"2026-04-30T19:28:11","name":"CVE-2026-31431","version":2,"mbox":"http://patchwork.ozlabs.org/series/502367/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2231527/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2231527/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (4096-bit key;\n unprotected) header.d=canonical.com header.i=@canonical.com\n header.a=rsa-sha256 header.s=20251003 header.b=s2V4EFFx;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com\n (client-ip=185.125.189.65; helo=lists.ubuntu.com;\n envelope-from=kernel-team-bounces@lists.ubuntu.com;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g644R6kNKz1yHv\n\tfor ; Fri, 01 May 2026 05:29:43 +1000 (AEST)","from localhost ([127.0.0.1] helo=lists.ubuntu.com)\n\tby lists.ubuntu.com with esmtp (Exim 4.86_2)\n\t(envelope-from )\n\tid 1wIX4q-0002kp-7e; Thu, 30 Apr 2026 19:29:36 +0000","from smtp-relay-internal-0.internal ([10.131.114.225]\n helo=smtp-relay-internal-0.canonical.com)\n by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.86_2) (envelope-from )\n id 1wIX4f-00021D-RZ\n for kernel-team@lists.ubuntu.com; Thu, 30 Apr 2026 19:29:25 +0000","from mail-wm1-f69.google.com (mail-wm1-f69.google.com\n [209.85.128.69])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id B2CEA3FE9F\n for ; Thu, 30 Apr 2026 19:29:25 +0000 (UTC)","by mail-wm1-f69.google.com with SMTP id\n 5b1f17b1804b1-488c2aa6becso10053955e9.2\n for ; Thu, 30 Apr 2026 12:29:25 -0700 (PDT)","from tuxedo-infinitybook (net-93-71-66-38.cust.vodafonedsl.it.\n [93.71.66.38]) by smtp.gmail.com with ESMTPSA id\n ffacd0b85a97d-448e74324a5sm8133217f8f.12.2026.04.30.12.29.23\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 30 Apr 2026 12:29:24 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com;\n s=20251003; t=1777577365;\n bh=lDgAtQ1+Kt/J5WragCr7feeILv2qoOCKuau6GVl3vB8=;\n h=From:To:Subject:Date:Message-ID:In-Reply-To:References:\n MIME-Version;\n b=s2V4EFFxEHiKfMtPzWHlQ3GYieGqSdUtbBkT+RfI9zQosh3u6hqIQMWj/FRWUVwiO\n QJeV/RAkk6evOFOPHhsdmvHjEPsGAl0MqBZ2ocZkPm9Mab1gKKvWO1456wRV7ZJuG6\n 1RLzUZDp3oUnyU6h58Xk3bASbhH4+b8keEWarBhb70LnwSa2ZRdKB4gnfxwyjM1Omo\n 6Mbn9s96e4tYHSLc2P0nS6RZs+AfRJswpNG/cntaoxQfLtnjSmcclzTNlVXtMPEjAs\n 0eHdpE0Q9ZeYfTMR/CYHrbJg9gBfXron9HI1VuXdSCMqIaGY008mWS6zebGRxwyUdB\n omSdb8NKirlDkO/PRWFiBTUH09NZb4yuAk6qQuooJl1uWmDlwjGpC1hsjVJd294uhz\n QCXwNY2kcqj6XHQbrv4hbk9za5+qz2sEPPB7DL3+GIdHTLNSlCKI0rT53Q9JSxndM9\n mzl/qGR0D0qmkvwNIIG8ILeuHyVYKTMtusocT2Vs6fUpItfdHOyGevyow0TD5yPcxu\n g9yDxG8MPvA/w1pefNMzO6pyGmKA/l3SOcd7iWWcDMp1qloq7YrXJyO7znXPbF26aT\n QyiaCjCyxdG4lkifhPt6FKHcgcmmSmBNUFzoXIpQPwZ8/wj64s9CmOSIj8BZDVX7y/\n bNpKJGVbk7BKdITOBy+/bbis=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777577365; x=1778182165;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=lDgAtQ1+Kt/J5WragCr7feeILv2qoOCKuau6GVl3vB8=;\n b=OzBXXLYaP7jZ7/iTHsWvHNLgsW82gvFMsp5sFHytlHmWju7V0/VgSS6ANAUwnwqjjO\n JLS4yKTRykSpaFpmFkJu/VxEwa6mjKxxV63DOZ8lkO3Y3eMrb8fhOUUXbT/bJSom7ufO\n qIBhQono6rG68K7dRr8kkuWVtgjJtmwpOZlxpAG85f2KiRXSuCJBCm7tQtx4JSDYuDLR\n 6ebGXrIZQ5zQ05wD8Xkz3RAmEKKD94njhCasFGXYiu/9I66FWdJhb/qayosTqWr3Msp3\n CPiNJ+M/fSD8MDR5vBK1jBEWmT6b4lvgkS/hXqAiYo6GiUtI0ekb/GXoHXpBq0Ff7ktm\n ZhIw==","X-Gm-Message-State":"AOJu0YwKGL92PnrHc4ClWJE+TP8BuiqPZOEHf3qoRNPUN3AQ4jGGJQfG\n BfXEr9HtpwBuu1ky8cdxU5d6PZ5nvIhXr0IoZhp5ZSb5mU5t8S7IIgs5gNZxIpJMe/Lv88PeYAG\n KclPMvFlURI2l0+9vUu6lGo1HHvyZ5/a19BXodZ8WYyyzZXP6UdWN9EpUV/KYAeftpy4MJdLCda\n r6yjXsMJz5cCB23g==","X-Gm-Gg":"AeBDiesHHa2EElljO/f42mDSAIK0/4mMcF6QVP2nF5/oRas+z3txgQxR6hjaB7TVGRA\n qQmiEHijSh1ffEsyDc1CeZ6mUdB1vh8pX/flWnEANh9VjyQXizqxuOm5EWc4CnjC1hgZPE+G7Nr\n 80Amb07oCzXsW/gKmcTJl1xPDcqkbgbVlmwlmFWJxRG6yrUqFvzABfHY2SqzTd/PgEwBRLN34m8\n ZltGFrgabSzyestiAC2Ma7L2VzymImoaTl7/NcD9yu3cmJg1qWfu46tkbMW7G3sG9Of3qi38AIP\n cEMIDsNn4OVVZJ4ZY3wDMBKpn3Ssklv+03am1/StxhxYBBgbs/eTc/OKwka+0IVndMYrh7XwFfw\n Zz5DHgxyzHEJ6hLP04z5r3TVX8mGhaBMFkzhKmj6QNCh7Cydh0OFlDXqF2zJ++sysjlCYPvmZiM\n Te2kgCKhvJwFSNbpQZcio4NZ880/3WnS5uANm+Jp0R4bnH7+R9xUueiSl9QwAZqywjr3mmli7xW\n BWy2Vb8louwaA==","X-Received":["by 2002:a05:6000:2dc8:b0:44a:47a4:ce91 with SMTP id\n ffacd0b85a97d-44a47a4cfefmr1547228f8f.25.1777577364905;\n Thu, 30 Apr 2026 12:29:24 -0700 (PDT)","by 2002:a05:6000:2dc8:b0:44a:47a4:ce91 with SMTP id\n ffacd0b85a97d-44a47a4cfefmr1547207f8f.25.1777577364461;\n Thu, 30 Apr 2026 12:29:24 -0700 (PDT)"],"From":"Massimiliano Pellizzer ","To":"kernel-team@lists.ubuntu.com","Subject":"[SRU][N][PATCH v2 5/9] crypto: authenc - use memcpy_sglist() instead\n of null skcipher","Date":"Thu, 30 Apr 2026 21:28:16 +0200","Message-ID":"\n <2b5a6517789ad618f2b1c7729520e8b69659ef83.1777576834.git.massimiliano.pellizzer@canonical.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"","References":"\n <177757626672.818044.11792928639290212185@tuxedo-infinitybook.public>\n ","MIME-Version":"1.0","X-BeenThere":"kernel-team@lists.ubuntu.com","X-Mailman-Version":"2.1.20","Precedence":"list","List-Id":"Kernel team discussions ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"kernel-team-bounces@lists.ubuntu.com","Sender":"\"kernel-team\" "},"content":"From: Eric Biggers \n\ncommit dbc4b1458e931e47198c3165ff5853bc1ad6bd7a upstream.\n\nFor copying data between two scatterlists, just use memcpy_sglist()\ninstead of the so-called \"null skcipher\". This is much simpler.\n\nSigned-off-by: Eric Biggers \nSigned-off-by: Herbert Xu \nSigned-off-by: Eric Biggers \nSigned-off-by: Greg Kroah-Hartman \n(cherry picked from commit 7bc058a9b82b066fa68d4bc8b8d2b61834609410 linux-6.12.y)\nCVE-2026-31431\nSigned-off-by: Massimiliano Pellizzer \n---\n crypto/Kconfig | 1 -\n crypto/authenc.c | 32 +-------------------------------\n crypto/authencesn.c | 38 +++-----------------------------------\n 3 files changed, 4 insertions(+), 67 deletions(-)","diff":"diff --git a/crypto/Kconfig b/crypto/Kconfig\nindex 4b6362105499..56a602956660 100644\n--- a/crypto/Kconfig\n+++ b/crypto/Kconfig\n@@ -222,7 +222,6 @@ config CRYPTO_AUTHENC\n \tselect CRYPTO_SKCIPHER\n \tselect CRYPTO_MANAGER\n \tselect CRYPTO_HASH\n-\tselect CRYPTO_NULL\n \thelp\n \t Authenc: Combined mode wrapper for IPsec.\n \ndiff --git a/crypto/authenc.c b/crypto/authenc.c\nindex d04068af9833..f1f7886bb34c 100644\n--- a/crypto/authenc.c\n+++ b/crypto/authenc.c\n@@ -9,7 +9,6 @@\n #include \n #include \n #include \n-#include \n #include \n #include \n #include \n@@ -28,7 +27,6 @@ struct authenc_instance_ctx {\n struct crypto_authenc_ctx {\n \tstruct crypto_ahash *auth;\n \tstruct crypto_skcipher *enc;\n-\tstruct crypto_sync_skcipher *null;\n };\n \n struct authenc_request_ctx {\n@@ -186,21 +184,6 @@ static void crypto_authenc_encrypt_done(void *data, int err)\n \tauthenc_request_complete(areq, err);\n }\n \n-static int crypto_authenc_copy_assoc(struct aead_request *req)\n-{\n-\tstruct crypto_aead *authenc = crypto_aead_reqtfm(req);\n-\tstruct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);\n-\tSYNC_SKCIPHER_REQUEST_ON_STACK(skreq, ctx->null);\n-\n-\tskcipher_request_set_sync_tfm(skreq, ctx->null);\n-\tskcipher_request_set_callback(skreq, aead_request_flags(req),\n-\t\t\t\t NULL, NULL);\n-\tskcipher_request_set_crypt(skreq, req->src, req->dst, req->assoclen,\n-\t\t\t\t NULL);\n-\n-\treturn crypto_skcipher_encrypt(skreq);\n-}\n-\n static int crypto_authenc_encrypt(struct aead_request *req)\n {\n \tstruct crypto_aead *authenc = crypto_aead_reqtfm(req);\n@@ -219,10 +202,7 @@ static int crypto_authenc_encrypt(struct aead_request *req)\n \tdst = src;\n \n \tif (req->src != req->dst) {\n-\t\terr = crypto_authenc_copy_assoc(req);\n-\t\tif (err)\n-\t\t\treturn err;\n-\n+\t\tmemcpy_sglist(req->dst, req->src, req->assoclen);\n \t\tdst = scatterwalk_ffwd(areq_ctx->dst, req->dst, req->assoclen);\n \t}\n \n@@ -328,7 +308,6 @@ static int crypto_authenc_init_tfm(struct crypto_aead *tfm)\n \tstruct crypto_authenc_ctx *ctx = crypto_aead_ctx(tfm);\n \tstruct crypto_ahash *auth;\n \tstruct crypto_skcipher *enc;\n-\tstruct crypto_sync_skcipher *null;\n \tint err;\n \n \tauth = crypto_spawn_ahash(&ictx->auth);\n@@ -340,14 +319,8 @@ static int crypto_authenc_init_tfm(struct crypto_aead *tfm)\n \tif (IS_ERR(enc))\n \t\tgoto err_free_ahash;\n \n-\tnull = crypto_get_default_null_skcipher();\n-\terr = PTR_ERR(null);\n-\tif (IS_ERR(null))\n-\t\tgoto err_free_skcipher;\n-\n \tctx->auth = auth;\n \tctx->enc = enc;\n-\tctx->null = null;\n \n \tcrypto_aead_set_reqsize(\n \t\ttfm,\n@@ -361,8 +334,6 @@ static int crypto_authenc_init_tfm(struct crypto_aead *tfm)\n \n \treturn 0;\n \n-err_free_skcipher:\n-\tcrypto_free_skcipher(enc);\n err_free_ahash:\n \tcrypto_free_ahash(auth);\n \treturn err;\n@@ -374,7 +345,6 @@ static void crypto_authenc_exit_tfm(struct crypto_aead *tfm)\n \n \tcrypto_free_ahash(ctx->auth);\n \tcrypto_free_skcipher(ctx->enc);\n-\tcrypto_put_default_null_skcipher();\n }\n \n static void crypto_authenc_free(struct aead_instance *inst)\ndiff --git a/crypto/authencesn.c b/crypto/authencesn.c\nindex e08032e80f18..a5fbb638d9d7 100644\n--- a/crypto/authencesn.c\n+++ b/crypto/authencesn.c\n@@ -12,7 +12,6 @@\n #include \n #include \n #include \n-#include \n #include \n #include \n #include \n@@ -31,7 +30,6 @@ struct crypto_authenc_esn_ctx {\n \tunsigned int reqoff;\n \tstruct crypto_ahash *auth;\n \tstruct crypto_skcipher *enc;\n-\tstruct crypto_sync_skcipher *null;\n };\n \n struct authenc_esn_request_ctx {\n@@ -158,20 +156,6 @@ static void crypto_authenc_esn_encrypt_done(void *data, int err)\n \tauthenc_esn_request_complete(areq, err);\n }\n \n-static int crypto_authenc_esn_copy(struct aead_request *req, unsigned int len)\n-{\n-\tstruct crypto_aead *authenc_esn = crypto_aead_reqtfm(req);\n-\tstruct crypto_authenc_esn_ctx *ctx = crypto_aead_ctx(authenc_esn);\n-\tSYNC_SKCIPHER_REQUEST_ON_STACK(skreq, ctx->null);\n-\n-\tskcipher_request_set_sync_tfm(skreq, ctx->null);\n-\tskcipher_request_set_callback(skreq, aead_request_flags(req),\n-\t\t\t\t NULL, NULL);\n-\tskcipher_request_set_crypt(skreq, req->src, req->dst, len, NULL);\n-\n-\treturn crypto_skcipher_encrypt(skreq);\n-}\n-\n static int crypto_authenc_esn_encrypt(struct aead_request *req)\n {\n \tstruct crypto_aead *authenc_esn = crypto_aead_reqtfm(req);\n@@ -193,10 +177,7 @@ static int crypto_authenc_esn_encrypt(struct aead_request *req)\n \tdst = src;\n \n \tif (req->src != req->dst) {\n-\t\terr = crypto_authenc_esn_copy(req, assoclen);\n-\t\tif (err)\n-\t\t\treturn err;\n-\n+\t\tmemcpy_sglist(req->dst, req->src, assoclen);\n \t\tsg_init_table(areq_ctx->dst, 2);\n \t\tdst = scatterwalk_ffwd(areq_ctx->dst, req->dst, assoclen);\n \t}\n@@ -283,11 +264,8 @@ static int crypto_authenc_esn_decrypt(struct aead_request *req)\n \n \tcryptlen -= authsize;\n \n-\tif (req->src != dst) {\n-\t\terr = crypto_authenc_esn_copy(req, assoclen + cryptlen);\n-\t\tif (err)\n-\t\t\treturn err;\n-\t}\n+\tif (req->src != dst)\n+\t\tmemcpy_sglist(dst, req->src, assoclen + cryptlen);\n \n \tscatterwalk_map_and_copy(ihash, req->src, assoclen + cryptlen,\n \t\t\t\t authsize, 0);\n@@ -323,7 +301,6 @@ static int crypto_authenc_esn_init_tfm(struct crypto_aead *tfm)\n \tstruct crypto_authenc_esn_ctx *ctx = crypto_aead_ctx(tfm);\n \tstruct crypto_ahash *auth;\n \tstruct crypto_skcipher *enc;\n-\tstruct crypto_sync_skcipher *null;\n \tint err;\n \n \tauth = crypto_spawn_ahash(&ictx->auth);\n@@ -335,14 +312,8 @@ static int crypto_authenc_esn_init_tfm(struct crypto_aead *tfm)\n \tif (IS_ERR(enc))\n \t\tgoto err_free_ahash;\n \n-\tnull = crypto_get_default_null_skcipher();\n-\terr = PTR_ERR(null);\n-\tif (IS_ERR(null))\n-\t\tgoto err_free_skcipher;\n-\n \tctx->auth = auth;\n \tctx->enc = enc;\n-\tctx->null = null;\n \n \tctx->reqoff = 2 * crypto_ahash_digestsize(auth);\n \n@@ -358,8 +329,6 @@ static int crypto_authenc_esn_init_tfm(struct crypto_aead *tfm)\n \n \treturn 0;\n \n-err_free_skcipher:\n-\tcrypto_free_skcipher(enc);\n err_free_ahash:\n \tcrypto_free_ahash(auth);\n \treturn err;\n@@ -371,7 +340,6 @@ static void crypto_authenc_esn_exit_tfm(struct crypto_aead *tfm)\n \n \tcrypto_free_ahash(ctx->auth);\n \tcrypto_free_skcipher(ctx->enc);\n-\tcrypto_put_default_null_skcipher();\n }\n \n static void crypto_authenc_esn_free(struct aead_instance *inst)\n","prefixes":["SRU","N","v2","5/9"]}