{"id":2231530,"url":"http://patchwork.ozlabs.org/api/patches/2231530/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/be411f8bd28434fa0eab9d8383cf659439ea197c.1777577013.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":"","list_archive_url":null,"date":"2026-04-30T19:28:26","name":"[SRU,J,v2,5/9] crypto: authenc - use memcpy_sglist() instead of null skcipher","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b841f4dedb9365aba97b467c0c6dfc37d76420e0","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/be411f8bd28434fa0eab9d8383cf659439ea197c.1777577013.git.massimiliano.pellizzer@canonical.com/mbox/","series":[{"id":502366,"url":"http://patchwork.ozlabs.org/api/series/502366/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/list/?series=502366","date":"2026-04-30T19:28:03","name":"CVE-2026-31431","version":2,"mbox":"http://patchwork.ozlabs.org/series/502366/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2231530/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2231530/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=Kg+4o+c+;\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 4g644c11xZz1yHv\n\tfor ; Fri, 01 May 2026 05:29:52 +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 1wIX4z-0003O1-6e; Thu, 30 Apr 2026 19:29:45 +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 1wIX4o-0002dT-JD\n for kernel-team@lists.ubuntu.com; Thu, 30 Apr 2026 19:29:34 +0000","from mail-wr1-f72.google.com (mail-wr1-f72.google.com\n [209.85.221.72])\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 09FF03FE9F\n for ; Thu, 30 Apr 2026 19:29:34 +0000 (UTC)","by mail-wr1-f72.google.com with SMTP id\n ffacd0b85a97d-43ff19e54beso880248f8f.2\n for ; Thu, 30 Apr 2026 12:29:34 -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.31\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 30 Apr 2026 12:29:31 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com;\n s=20251003; t=1777577374;\n bh=e19DymqV+cZHrndhsmaLiiqE+kJH7qBP6OdpT3k85O8=;\n h=From:To:Subject:Date:Message-ID:In-Reply-To:References:\n MIME-Version;\n b=Kg+4o+c+ki5kf0eYLjIgeU+j0UroRN9G352RM0A7NH0KqlJAxsz7cLAQfbuhxByoo\n 3dmfAFK06V80cwgRHIjTIKDEHXIo1gOv9Z1YCSOMIQ+1vRg2PMwzOnVb2baeJvMIr0\n hEkct69IWF4wtgJJJvRS62/qIfqlbHX3o5UPdHjN6lSfWA/griIVrmNrj996wXHAxn\n DVxWi1NRuM08Mif4B4Vcp3rq7pD4qXP2D1O8TwuYUmuJYuSlh0GG6LjF59Hi5Vt34F\n 0kaiB17C6XecMqCnbLlq1TamG0maKXJyNQZkuUgaHy8SVCWEfSlqYuQghKYWJhnwm7\n 2bCIXsQsjU5YGLcJQJ3sMgQ03o/Dj+3oDCgEI/+OHd/0fFI2s7ephu2e9PW/9TGU4p\n EDJIOzXuxyNUqg14KAqpvO6Ikt0owTFEgmsntFJto+D9Sio2MHF+ggooBJSDBZYkvM\n ORsVoewkpiJxpimT3xYkU9irf9D89qMBQKL82XrfXO911Aq/AQaxBTwDH0NcB52v+R\n C/iW+7Yrsb8S2JAxekJ3Smvy4D2QlmLyR9QISUR97MHphLOKxrCFrs/e6Vw9ysKHKW\n nUVeBxRkuFSFHSTRBQ3mc7yw+ZzVXPW5IELyxGhY7ZuOAY85tAZDfROPkRU6BYwMOK\n 1Ifw8ObtIqWrNNy9UmtMb+4o=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777577373; x=1778182173;\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=e19DymqV+cZHrndhsmaLiiqE+kJH7qBP6OdpT3k85O8=;\n b=U2lGP5/DmWnbT+lh5ohrudgd3rVO+8ubCH4A1VqcLK6XcngJ6feirXTOwFkOq9nV9W\n AQdn11ZVUpYoBHJlP7pyI4u4BKQdJ0hebjHxP44Q7atfH3c7o3D2Cp3r80gijv5fNUSp\n QqCy5bs08Ac1xMaZu4llRuR6ih8cVtVM0/AfNZAEAyN9dRMK5ZyPLZ3aFuXCvEqzs275\n pSSPMHbUVYrP4gzAKrLw3IsZcXVRwjcW/wWzHG4XvEw2yq2XjDgaiDJGva6zBPYfh0/9\n 6RHMgU03ZQqDZieitfqYCqXQk+qQ7lD3sk74I8MWYZKFlzLsSqvnj5Jose+OP5mP/0fQ\n g95Q==","X-Gm-Message-State":"AOJu0YxtrT8/bfnDYNEU2Dc+m91i45dzkgcWJvjTyjPILac1a1CJfyrC\n 2q+10vrsxs0t0GMvgeSXX3cKqqOBSfrjktwe7jqsjc0GMlVXxRostcK9bm72bnMZGuATouScdw/\n gjFeMO6mw4w4C/+wq2PaP3q0bOKTBUCShUmN6C6+rQYyY2OsjcRxWOYSDnfVxa5JfrFJQb4r08p\n RCrxOdLbQPq8oZLA==","X-Gm-Gg":"AeBDietFqITiQMkLGrFItRggoTVm7mvISlHFb0/xGXIxwhu2i/3CZVD6gXgeJ7x7HhN\n lSWU5eLBL61HRTsrl2LyL3B1TIEpfhx7A4JxbXbjkAAaObuGpjEnClXkZYPEUciow97nXotSjhr\n V5QUeypP3AXHcxDQ8SS3Ic84hVxBhBH/S69DH0sJXkAxFaJX6qOeKWTBatIT4bccfgsdVe3MF6f\n cecz8mgIBT4VtVCqXyVjrKVLFjky+ZTYAmOUHpqWT5Q82jdVLxivnnrZdNLqSfJnemmdfrlOLzo\n /KQNPnDhFhxPdfNjltBufQKLx9Fp+O0j6NNdi0aOgwAD8yBC2AF4zF7lL5AH7HIqQLPQRb9hhRh\n YpGYAQ+9BEzh9xNsuzu1haFLcXgzXAWj1JmLTRxEa1bfecg/64oPAY0IGoGkirDU6tkfnOWJ56w\n 7T80xm9V4ZiRpaosxFI+OCZGLrIgr/flgEN+cycHIvB1zIIXSoxwAvPmeOHPXuUlEXccsp9P9Ak\n xHcvoC3udHG2w==","X-Received":["by 2002:a5d:5d10:0:b0:43d:75a2:44aa with SMTP id\n ffacd0b85a97d-4493f03bb85mr7241768f8f.43.1777577373323;\n Thu, 30 Apr 2026 12:29:33 -0700 (PDT)","by 2002:a5d:5d10:0:b0:43d:75a2:44aa with SMTP id\n ffacd0b85a97d-4493f03bb85mr7241679f8f.43.1777577372000;\n Thu, 30 Apr 2026 12:29:32 -0700 (PDT)"],"From":"Massimiliano Pellizzer ","To":"kernel-team@lists.ubuntu.com","Subject":"[SRU][J][PATCH v2 5/9] crypto: authenc - use memcpy_sglist() instead\n of null skcipher","Date":"Thu, 30 Apr 2026 21:28:26 +0200","Message-ID":"\n ","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 e416c41a96c85ce12f608c30eb72fd9dfb75184b linux-5.15.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 15994570627bf..126d4699f06f7 100644\n--- a/crypto/Kconfig\n+++ b/crypto/Kconfig\n@@ -195,7 +195,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 \t This is required for IPSec.\ndiff --git a/crypto/authenc.c b/crypto/authenc.c\nindex 17f674a7cdff5..2b402e764529c 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@@ -174,21 +172,6 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req,\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@@ -207,10 +190,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@@ -311,7 +291,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@@ -323,14 +302,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@@ -344,8 +317,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@@ -357,7 +328,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 6487b35851d54..fceee6d67d34c 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@@ -164,20 +162,6 @@ static void crypto_authenc_esn_encrypt_done(struct crypto_async_request *req,\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@@ -199,10 +183,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@@ -292,11 +273,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@@ -332,7 +310,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@@ -344,14 +321,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 = ALIGN(2 * crypto_ahash_digestsize(auth),\n \t\t\t crypto_ahash_alignmask(auth) + 1);\n@@ -368,8 +339,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@@ -381,7 +350,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","J","v2","5/9"]}