From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 143BFC3ABCA for ; Thu, 8 May 2025 19:41:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 651896B00A6; Thu, 8 May 2025 15:41:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 626FF6B00A7; Thu, 8 May 2025 15:41:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C9176B00A8; Thu, 8 May 2025 15:41:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 2AEFF6B00A6 for ; Thu, 8 May 2025 15:41:42 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 3BAD2BE2CB for ; Thu, 8 May 2025 19:41:43 +0000 (UTC) X-FDA: 83420760486.02.4B103A5 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by imf17.hostedemail.com (Postfix) with ESMTP id 0E07E40003 for ; Thu, 8 May 2025 19:41:40 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=UhNmXnJR; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf17.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 192.198.163.17 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746733301; a=rsa-sha256; cv=none; b=QhjQE9bTNoF3BFSaNAz9p6OmgyNecRmhHvUeI8zEa1fux2jN+c4QYfRZkKFFNCL/5Q05dD dfZyvasLyKd6JRNKa1rBwZIuIM3xOvTPidTmy8HdJb3dw71BzIADCLtgNRvf4kRH3iHNwr +3F1AuskVoCkwjP5rLhXmsU+FmBTd5M= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=UhNmXnJR; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf17.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 192.198.163.17 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746733301; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=DYoHSDRkmyYIzJYmmBIbvNis6kw7rdYKNsF44upaO6s=; b=FTjs3F2WeRGu6yDUTfjVaiLIf716rcDRv0lwNrDYY63MsXupJXc5IqU5xa7vtaUbudNrU8 lW3HYyHr1DZNLeorlzdIwkN8DhlXi5cvyACdYOJ6gwYRDklv9x3IiQbyQoPKkajMUa3tCN tfukRbvhBMsFofxyzdMHunNFPi6ikyQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1746733301; x=1778269301; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sJFxWyA6AJF6CcAZ5xFoncDGNwqA2S5ppE8eb6ZDAWI=; b=UhNmXnJRAZKDrDYugwBtYEWw/naSX9NGU8wgg+lu9+qrXUCKYVPx6pAC APrbbzu4s1KDASGviz7YpieLTc1ZFLlyW0s8Cgr0rZXXNpb40tlY+V++f eXulyXBo0/pNKaWjovmoauD6ESSrjunuw3jh4PQtmqYcKMgM4JkyYDQ9F 8c0/419FmFyCg/cCDwGP4cDb99RD8p6YlAKPc9kqoKGpZ2MsRb8jERC0i yF/EhI93ZY/E1Jl0DZfZTFdbvk2XFsRiq9QCVuospXt9f22D3NLO6rW3L dS4WVezsNe60H2piIKPNajLec4Vy43pp6ljsnKFmDo8jW0rg0tcM2sdIp w==; X-CSE-ConnectionGUID: U+AfWKdwRz2xvvQbXS9sjA== X-CSE-MsgGUID: UrMI5t00QrOBE+gW3qI5xA== X-IronPort-AV: E=McAfee;i="6700,10204,11427"; a="48454606" X-IronPort-AV: E=Sophos;i="6.15,273,1739865600"; d="scan'208";a="48454606" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2025 12:41:38 -0700 X-CSE-ConnectionGUID: LAb/b0l+REKDfRVJBNReeQ== X-CSE-MsgGUID: CFUP26gyRf6tnxsLmGwIbQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,273,1739865600"; d="scan'208";a="136880829" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.115]) by fmviesa010.fm.intel.com with ESMTP; 08 May 2025 12:41:37 -0700 From: Kanchana P Sridhar To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, hannes@cmpxchg.org, yosry.ahmed@linux.dev, nphamcs@gmail.com, chengming.zhou@linux.dev, usamaarif642@gmail.com, ryan.roberts@arm.com, 21cnbao@gmail.com, ying.huang@linux.alibaba.com, akpm@linux-foundation.org, senozhatsky@chromium.org, linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au, davem@davemloft.net, clabbe@baylibre.com, ardb@kernel.org, ebiggers@google.com, surenb@google.com, kristen.c.accardi@intel.com, vinicius.gomes@intel.com Cc: wajdi.k.feghali@intel.com, vinodh.gopal@intel.com, kanchana.p.sridhar@intel.com Subject: [PATCH v9 04/19] crypto: scomp - Fix off-by-one bug when calculating last page Date: Thu, 8 May 2025 12:41:19 -0700 Message-Id: <20250508194134.28392-5-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20250508194134.28392-1-kanchana.p.sridhar@intel.com> References: <20250508194134.28392-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 0E07E40003 X-Stat-Signature: 6g9hioh8fxasykj5squf3pwtinm3xwtq X-Rspam-User: X-HE-Tag: 1746733300-459833 X-HE-Meta: U2FsdGVkX1/H3yH9pVNEaN2AR5t/RavDYOgf7SEUz4RkPttlOse3xLA0K7h3TVA5VQZTGks7+WG7KBrnjuN2I+n4XvCvRqTjX2FGDSo+yYT5ah5RUZq7AQxJ3NbIPjl+jP/4wXs9C3L82nxvailtP+Sr1o8BnTN+AiaMjrFtCSL/PStCd5dcgXqa4UumaOJkhaE+xI9Y1Tkjbr9FZs5ESDNWr2OWBanUvkdgMoO9WH0ozN8Zk5aGtFt+0u/jor8g39bdEBCRQQrsJM5slLh8xVNhh8148fS/EWnafo7UEmCFZkOGNlghPYLgY3CzI1TR808+6tdfVcECP7jmimghm/rqXG+UBFs9xGi7//prTs50hbQ+fcmsc2f7PSGFF4pl57+0yJK+KP32XPA52YUAcVoNahpv6OM8gkL4sEPhYRfOoSwNh/ZkO6mV0Xy1KDQTHegPP4jO+dMhj0Kn9suOaNZLvyN3qJOxMGFYLAc3gOoRlt1scIiwHY0hkd0E1v2HZ5RCt5yKDHQfd4ixalbzFbLRJ9KpgHP6oE9EPm0yODV3fVEyK+7WUWC267sLHFDOhi/e2v//YDqVmbeIuaF5RtfbZlIzCsfj8KI2Us8nORPI7ByHam11Dx8vu7B31rYdQdeBw0r8XIGu7FqTbT+1WET4tMt7nkuX8MDG43MRjjbmQZ8p0GfvjkgmNjM9DEEmkOQz+/X4LoNEXLOQRDX9bZ1y1UG+/fvcPgTd1rCQE3mk8MO9vHY/yfi4nZlJg7W9vtyrcZf777NTeAbIvi1PpnxcJZZCax/WxOamfvqsMRaMPn1xLRLAML3PY0fC5xevCdfHfaLyGI+sbESPR8kkfe9P/WrjQCpeXKKuKUh5+IPX+z5pAOCwFGVtxMGoYaGkirLjeFrRItfHU7NODqK5lgDmgG+ou8Dv7UerppN158XACtaXRQA1ux0aW3+lnyO56dx6jAtO57IPXuMbvwe yUu+yZhm oc9eQ8b2+/D5tDGM79rMwWw5xGx8Cjgg5UV++He0Ab0V0v88xYn+uELUfmg2QjsGS7CmtJjIYPFKpU21p29taKAr9hMKKD29Gxklg+7/asZag9lxug44wwYtinyJMydx8kKMC7VfcY5BaDT/4nV5g8AkeZvDDpl4v62rzAcW6OTioz85vtfF8ObU31z3X6Cdl//PxYv2FWMs5akE6dWCKh6nY4um0Un1dKvRW+wwCkqs7LWs= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Fix off-by-one bug in the last page calculation for src and dst. Reported-by: Nhat Pham Fixes: 2d3553ecb4e3 ("crypto: scomp - Remove support for some non-trivial SG lists") Signed-off-by: Herbert Xu --- crypto/scompress.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/scompress.c b/crypto/scompress.c index c1ce12564299..1ed52b9740c5 100644 --- a/crypto/scompress.c +++ b/crypto/scompress.c @@ -215,8 +215,8 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) spage = nth_page(spage, soff / PAGE_SIZE); soff = offset_in_page(soff); - n = slen / PAGE_SIZE; - n += (offset_in_page(slen) + soff - 1) / PAGE_SIZE; + n = (slen - 1) / PAGE_SIZE; + n += (offset_in_page(slen - 1) + soff) / PAGE_SIZE; if (PageHighMem(nth_page(spage, n)) && size_add(soff, slen) > PAGE_SIZE) break; @@ -243,9 +243,9 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) dpage = nth_page(dpage, doff / PAGE_SIZE); doff = offset_in_page(doff); - n = dlen / PAGE_SIZE; - n += (offset_in_page(dlen) + doff - 1) / PAGE_SIZE; - if (PageHighMem(dpage + n) && + n = (dlen - 1) / PAGE_SIZE; + n += (offset_in_page(dlen - 1) + doff) / PAGE_SIZE; + if (PageHighMem(nth_page(dpage, n)) && size_add(doff, dlen) > PAGE_SIZE) break; dst = kmap_local_page(dpage) + doff; -- 2.27.0