{"id":2231516,"url":"http://patchwork.ozlabs.org/api/patches/2231516/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/03a7c4efef3fce974ec8106bc0cdd5995a99f45e.1777576284.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":"<03a7c4efef3fce974ec8106bc0cdd5995a99f45e.1777576284.git.massimiliano.pellizzer@canonical.com>","list_archive_url":null,"date":"2026-04-30T19:28:07","name":"[SRU,Q,v2,3/6] crypto: authencesn - Do not place hiseq at end of dst for out-of-place decryption","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c4c03c697c00b4effa3b90aac8d78ccc077ac248","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/03a7c4efef3fce974ec8106bc0cdd5995a99f45e.1777576284.git.massimiliano.pellizzer@canonical.com/mbox/","series":[{"id":502365,"url":"http://patchwork.ozlabs.org/api/series/502365/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/list/?series=502365","date":"2026-04-30T19:28:04","name":"CVE-2026-31431","version":2,"mbox":"http://patchwork.ozlabs.org/series/502365/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2231516/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2231516/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=mro61aPl;\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 4g64482yttz1yK1\n\tfor ; Fri, 01 May 2026 05:29:28 +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 1wIX4c-0001pd-GW; Thu, 30 Apr 2026 19:29:22 +0000","from smtp-relay-internal-1.internal ([10.131.114.114]\n helo=smtp-relay-internal-1.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 1wIX4Z-0001ig-1e\n for kernel-team@lists.ubuntu.com; Thu, 30 Apr 2026 19:29:19 +0000","from mail-wr1-f71.google.com (mail-wr1-f71.google.com\n [209.85.221.71])\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-1.canonical.com (Postfix) with ESMTPS id E480C3F637\n for ; Thu, 30 Apr 2026 19:29:18 +0000 (UTC)","by mail-wr1-f71.google.com with SMTP id\n ffacd0b85a97d-4470d6d2a4fso1546291f8f.1\n for ; Thu, 30 Apr 2026 12:29:18 -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.17\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 30 Apr 2026 12:29:17 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com;\n s=20251003; t=1777577358;\n bh=LhiRXjvSawfT7FR86R2mKm2XNWoTtLbRfOb+VFFm268=;\n h=From:To:Subject:Date:Message-ID:In-Reply-To:References:\n MIME-Version;\n b=mro61aPlQjZj921pHv9aVKeyaB31KWQOJXo5+nkT0Iv5qTvlJJ63cMJ0mYlncUDam\n HoLGBcljrXdy8dzY3L+oSUXDOEnH9mubg5EHtuC4y+34HuM/C9hf9aP5zUii8Ycnrf\n d/WSvgJMQo4fsJtnmnkItM60GjcP0saJHlJFVwlXNgtMFz+AFsLWg+7Jmn8+aPQDoT\n uUYrtDjxx2MW28ZFQyEWRU96q6XT50C6EKTy/v6McShUdpuER2bqB1xiTZr4QaaGeT\n K40/Y+sLbQm1d+wfgzrq0Ht9ylVJYF/MfRS+Xrx/mdi7U+TAP6KngNp1NQUg2geoCf\n 2/rvCoJzgh2ekfEDamw1Jf3B0BXbBWypaNQ3p5Efp0ojtMSWQ0/p/nZIYwVPbGZkjc\n UCBSm+WNN0Fq30jk28vnAc2ktBNcGVb/7cG1m43NsFueefe2/uJ4tBXBeffS79feUE\n ZqKhXqITfZ542ewpooYlN+Kl3p0UOKrwfBaEKwo8um2wQ3Lc8S7UdWUa2oY0A+2E11\n kcu3UF6jlMSuS5cCFRofwpl21/NKAAqyrloqFn0Z9nQhKdCR7l97x82SJzIORRRprH\n SE7CPz4i2/gZ7+NqwjCPUkKfZyiCWC+bCTxehx3w8Am1ybMQQs+Jcx0tasYJXGLFBP\n /eOBAffElVzGIOVLP12bbIP0=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777577358; x=1778182158;\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=LhiRXjvSawfT7FR86R2mKm2XNWoTtLbRfOb+VFFm268=;\n b=JyDx/9RvcO2QdT5G/uLKrKsaKXDoIeX5eTSm+TRFr0ir+GCJVYfn//QtGHGnuUTS43\n Mma2sfmpJXuE8kgvGktYy4uE2IA6+FKX2Nj+8q3/94nFbPR2Sj1TjqkxUMLuhDxjb0on\n kQaEC2jWlisZJEhbCNihF2QLbtIk6thIPlTQvRw8zEYyhp1/vDP0co3FXoZsZijgSJV5\n FUloGsuwbe+MedAcIS8ZDjW0r600wtupu0tbtElpUShcuFVxkBVSRJ1Frdy0Hs0osWjn\n hdkIPOoH3b5kiumNhlR0tqQoed2/mz9iV1WXr0t6tvCQwSQ4TLSdV+xaLt7YiyLnGHuT\n 3rAA==","X-Gm-Message-State":"AOJu0YxvXyoOKVXyosmlPHdBYrw1b/Uh/rOSW11gO96yG3pTDLVCuRhR\n JOPF87t6TDcgZKUodhtrPMp3YhTkmoHNSD369ZOsMaInv7UL5rGOgMTgFJnmovIQkV53quxVdTg\n HHxsYK2ndcHpLnfnSeIKlZD7uGyZIPD7q6kKqXaiKsQDTFIzcdJWxVNd3QtUX/hLq1zJx4Nvqos\n 3ETuCcomMZdBq6MA==","X-Gm-Gg":"AeBDievBlxZcexiQru5FqkjiaH487taBPnLsLq5kK/A6nTc/PPHklY4H5bh1Z/m9xbU\n I2cpvxZ71YNxY05HyegTPE5sPIj4TyjOpYmpSwqu29GYjQp5X4OmYD8bFd8wUqjfY2VYqhxaYVE\n 6sYJJw4su+tOblZTvMXIeFmE39xDc3kux7eALM2AgA8FcDCZLFXDVg1CKf7d4fjF0J83DkvUYAw\n 5Re/cbBbFBycyR1WqWKhoRPmH2IMXpy2IBZiapbi+iKpLWYPUEsVXyC2WNu/j2kvQ83V7brYrl0\n Ab4QoGt023Far9WoSXVNlWuAUMkmOMlAKU8Q3nqaqaPjyLvlSEF0Wl9gf+tP+Qn79ZLPXMUlRfM\n V6oO++xx7D4rcLVxD46XqKFAvKbsCZIX2sOAvk28+eK25CNkxBa9BmohprM2BVIYb8/PphqVGGZ\n /dlKdO4GI4psA9BWrKrx321Rpa7uLoIThK3VkAiIoxWaRdF7vl9uXT0YZrUJl0kgEvelvRq+pt2\n vK96qEYKzJRKA==","X-Received":["by 2002:a5d:5d10:0:b0:448:75b0:5ae5 with SMTP id\n ffacd0b85a97d-449399b9b65mr7159688f8f.0.1777577358177;\n Thu, 30 Apr 2026 12:29:18 -0700 (PDT)","by 2002:a5d:5d10:0:b0:448:75b0:5ae5 with SMTP id\n ffacd0b85a97d-449399b9b65mr7159652f8f.0.1777577357707;\n Thu, 30 Apr 2026 12:29:17 -0700 (PDT)"],"From":"Massimiliano Pellizzer ","To":"kernel-team@lists.ubuntu.com","Subject":"[SRU][Q][PATCH v2 3/6] crypto: authencesn - Do not place hiseq at end\n of dst for out-of-place decryption","Date":"Thu, 30 Apr 2026 21:28:07 +0200","Message-ID":"\n <03a7c4efef3fce974ec8106bc0cdd5995a99f45e.1777576284.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: Herbert Xu \n\nWhen decrypting data that is not in-place (src != dst), there is\nno need to save the high-order sequence bits in dst as it could\nsimply be re-copied from the source.\n\nHowever, the data to be hashed need to be rearranged accordingly.\n\nReported-by: Taeyang Lee <0wn@theori.io>\nFixes: 104880a6b470 (\"crypto: authencesn - Convert to new AEAD interface\")\nSigned-off-by: Herbert Xu \n\nThanks,\n\nSigned-off-by: Herbert Xu \n(cherry picked from commit e02494114ebf7c8b42777c6cd6982f113bfdbec7)\nCVE-2026-31431\nSigned-off-by: Massimiliano Pellizzer \n---\n crypto/authencesn.c | 48 +++++++++++++++++++++++++++------------------\n 1 file changed, 29 insertions(+), 19 deletions(-)","diff":"diff --git a/crypto/authencesn.c b/crypto/authencesn.c\nindex 542a978663b9..c0a01d738d9b 100644\n--- a/crypto/authencesn.c\n+++ b/crypto/authencesn.c\n@@ -207,6 +207,7 @@ static int crypto_authenc_esn_decrypt_tail(struct aead_request *req,\n \tu8 *ohash = areq_ctx->tail;\n \tunsigned int cryptlen = req->cryptlen - authsize;\n \tunsigned int assoclen = req->assoclen;\n+\tstruct scatterlist *src = req->src;\n \tstruct scatterlist *dst = req->dst;\n \tu8 *ihash = ohash + crypto_ahash_digestsize(auth);\n \tu32 tmp[2];\n@@ -214,23 +215,27 @@ static int crypto_authenc_esn_decrypt_tail(struct aead_request *req,\n \tif (!authsize)\n \t\tgoto decrypt;\n \n-\t/* Move high-order bits of sequence number back. */\n-\tscatterwalk_map_and_copy(tmp, dst, 4, 4, 0);\n-\tscatterwalk_map_and_copy(tmp + 1, dst, assoclen + cryptlen, 4, 0);\n-\tscatterwalk_map_and_copy(tmp, dst, 0, 8, 1);\n+\tif (src == dst) {\n+\t\t/* Move high-order bits of sequence number back. */\n+\t\tscatterwalk_map_and_copy(tmp, dst, 4, 4, 0);\n+\t\tscatterwalk_map_and_copy(tmp + 1, dst, assoclen + cryptlen, 4, 0);\n+\t\tscatterwalk_map_and_copy(tmp, dst, 0, 8, 1);\n+\t} else\n+\t\tmemcpy_sglist(dst, src, assoclen);\n \n \tif (crypto_memneq(ihash, ohash, authsize))\n \t\treturn -EBADMSG;\n \n decrypt:\n \n-\tsg_init_table(areq_ctx->dst, 2);\n+\tif (src != dst)\n+\t\tsrc = scatterwalk_ffwd(areq_ctx->src, src, assoclen);\n \tdst = scatterwalk_ffwd(areq_ctx->dst, dst, assoclen);\n \n \tskcipher_request_set_tfm(skreq, ctx->enc);\n \tskcipher_request_set_callback(skreq, flags,\n \t\t\t\t req->base.complete, req->base.data);\n-\tskcipher_request_set_crypt(skreq, dst, dst, cryptlen, req->iv);\n+\tskcipher_request_set_crypt(skreq, src, dst, cryptlen, req->iv);\n \n \treturn crypto_skcipher_decrypt(skreq);\n }\n@@ -255,6 +260,7 @@ static int crypto_authenc_esn_decrypt(struct aead_request *req)\n \tunsigned int assoclen = req->assoclen;\n \tunsigned int cryptlen = req->cryptlen;\n \tu8 *ihash = ohash + crypto_ahash_digestsize(auth);\n+\tstruct scatterlist *src = req->src;\n \tstruct scatterlist *dst = req->dst;\n \tu32 tmp[2];\n \tint err;\n@@ -262,24 +268,28 @@ static int crypto_authenc_esn_decrypt(struct aead_request *req)\n \tif (assoclen < 8)\n \t\treturn -EINVAL;\n \n-\tcryptlen -= authsize;\n-\n-\tif (req->src != dst)\n-\t\tmemcpy_sglist(dst, req->src, assoclen + cryptlen);\n+\tif (!authsize)\n+\t\tgoto tail;\n \n+\tcryptlen -= authsize;\n \tscatterwalk_map_and_copy(ihash, req->src, assoclen + cryptlen,\n \t\t\t\t authsize, 0);\n \n-\tif (!authsize)\n-\t\tgoto tail;\n-\n \t/* Move high-order bits of sequence number to the end. */\n-\tscatterwalk_map_and_copy(tmp, dst, 0, 8, 0);\n-\tscatterwalk_map_and_copy(tmp, dst, 4, 4, 1);\n-\tscatterwalk_map_and_copy(tmp + 1, dst, assoclen + cryptlen, 4, 1);\n-\n-\tsg_init_table(areq_ctx->dst, 2);\n-\tdst = scatterwalk_ffwd(areq_ctx->dst, dst, 4);\n+\tscatterwalk_map_and_copy(tmp, src, 0, 8, 0);\n+\tif (src == dst) {\n+\t\tscatterwalk_map_and_copy(tmp, dst, 4, 4, 1);\n+\t\tscatterwalk_map_and_copy(tmp + 1, dst, assoclen + cryptlen, 4, 1);\n+\t\tdst = scatterwalk_ffwd(areq_ctx->dst, dst, 4);\n+\t} else {\n+\t\tscatterwalk_map_and_copy(tmp, dst, 0, 4, 1);\n+\t\tscatterwalk_map_and_copy(tmp + 1, dst, assoclen + cryptlen - 4, 4, 1);\n+\n+\t\tsrc = scatterwalk_ffwd(areq_ctx->src, src, 8);\n+\t\tdst = scatterwalk_ffwd(areq_ctx->dst, dst, 4);\n+\t\tmemcpy_sglist(dst, src, assoclen + cryptlen - 8);\n+\t\tdst = req->dst;\n+\t}\n \n \tahash_request_set_tfm(ahreq, auth);\n \tahash_request_set_crypt(ahreq, dst, ohash, assoclen + cryptlen);\n","prefixes":["SRU","Q","v2","3/6"]}