Received: by 2002:ac8:4f8f:0:b0:429:955e:b7c6 with SMTP id j15csp774qtw; Tue, 16 Jan 2024 12:52:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IGuZFmVlR3FUOLVFC1k78CbYNgfmrKmQ54FsXiVCak6ly9kEDjEj8t8lvufFxLSqGdlJaUv X-Received: by 2002:a17:906:2304:b0:a29:905d:1815 with SMTP id l4-20020a170906230400b00a29905d1815mr7887192eja.60.1705438362219; Tue, 16 Jan 2024 12:52:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705438362; cv=pass; d=google.com; s=arc-20160816; b=v18a8YW0QDV3X6Ohp2g3F/qLqUKDT10b8u5jU+KHnvUWgyt4Sy2NkqWd7MJdGWPdon SomSD4ZXJEwEs9m8PZPqxXQcWrH+wiVTq/BIFasq23v0J9/ejk+RF4qYh2Uk2auNBtv6 GpRS/UIQ3l0fMxgzXZHEnWBZ0RB56NVpi2/tDY+CgnOGC2RdgKh2JwOEhLwBjL7i04TU /gDGdTZXn8X+MDgnvut8O1mb8Z9Swm6EdSkg/nzKFvyatDP/flyqqjdhWoW/mK6OGVgc KdLaa5DvOVhktEIpIuJaP0NTfrk1oNcK37l8zduVZwrnS705wxEWUJNWeTuDa5Wt7Ve1 hOMg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=E+5odqhUVAXoY1WcAtwzn4KihWRbPKx7V3vHdFM6bAY=; fh=is8HsmDLP31jpD66FCCDJ8/MMfiPxx7aOXxiKp1IAnk=; b=dLX3r44+RAl41XoSbkcOioT5yzNdpguqozbC4HU9BLZX6ZAhk2Fmq/X+61iM1BBNAt XxtBEB3xFAbQcX1ZR6Y15R+hrg9h9GrpQdxwKgta1JmowQgSgVMo6IAAh2RZm5MxwoSK UYFOeQN5HWd8RrGqdTxLHNRBBsrFIjCuKb4LWDEaEmIV27z6JuJcTd9oxaMxJf1ROAlQ /DPdxdaGiGENPTqZ9xsDJe7PCqqPqH2ZEGa39tu4fq614Dy2mHtk6dUZOVPcgwnf+CiN yTRC7IWvD1aeQq5tP6ZxCPSyW8p1szh5OaiL/U4SqYJaFYCczvobrj9J2bNqA661NElW iDkQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ejm+Vxo+; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-27991-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27991-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id n17-20020a170906165100b00a27e0f3d006si5293634ejd.646.2024.01.16.12.52.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 12:52:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-27991-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ejm+Vxo+; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-27991-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27991-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id BC8891F25D04 for ; Tue, 16 Jan 2024 20:52:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 26834139174; Tue, 16 Jan 2024 19:53:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ejm+Vxo+" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40F31286BB; Tue, 16 Jan 2024 19:53:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434792; cv=none; b=gGLojrS/NtVx3X1HV6ubhc6dVOeyJhEMSbbcackchJhHGYsbh4tMJ6SERf0Bb4GUCfZZdrMEmbrvSW+Q0mbpeoNbELxB+vfTbHV1KsCWHxrNdO9S1rk3rFP2XJjht0X2udGE+OctqVGUHUC76EoKeIIgj/AEowxqnZeX7Q95oys= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434792; c=relaxed/simple; bh=KANHFBaqsOkmhse8jBTL8CuQiAWzvFMUgPyS2O7nW3M=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:X-stable: X-Patchwork-Hint:X-stable-base:Content-Transfer-Encoding; b=uVz/TByFq9oKEmC0X/shux/wSAIEX7Gj4tuDudqqCrDqvU9fQUFIfrCgeWLVvxy6tgOJswatEUX7xfKXne9OVnQGEQvVROZloTylpWuwk4Xaf1jfZoVYu1TYnadlsTPOSSfK0F+L5URi7XZk0wJgSt26E/2tvbTGbtNyS/UoHdE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ejm+Vxo+; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEEA6C433C7; Tue, 16 Jan 2024 19:53:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705434790; bh=KANHFBaqsOkmhse8jBTL8CuQiAWzvFMUgPyS2O7nW3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ejm+Vxo+pjc0iVRjxEFmfG1pah6NwFKzgyO3bCjK807mxofbMmgCyCxInpktxHpb/ 8WzJE03gNkyspaoIneRc0b4bwgUcoh1kuI5N4/54QKv6Yvh+LAXjs3AZYZnONcHCsB 9AdTGwQWAAKbXRmHPCPAq1GqZTgsiy2bpBZjVHjKtLLHiczQVdbi+SjiS4NcpwVMBJ 6kECkdtTY0XUDi0PmpUjoFEa5TKRsDfWmFRbTAgZdfD5FOYlbbQrEdpt5vGkFYrrAc qHFrXfmT8iqKXIAk6X8LwNo9yIOqYSlglJ96CNAToRtd4KqJxhtGQTR52VEY+QnRZS /rwyT8qE4YevQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christoph Hellwig , Johannes Thumshirn , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 079/104] block: prevent an integer overflow in bvec_try_merge_hw_page Date: Tue, 16 Jan 2024 14:46:45 -0500 Message-ID: <20240116194908.253437-79-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116194908.253437-1-sashal@kernel.org> References: <20240116194908.253437-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.12 Content-Transfer-Encoding: 8bit From: Christoph Hellwig [ Upstream commit 3f034c374ad55773c12dd8f3c1607328e17c0072 ] Reordered a check to avoid a possible overflow when adding len to bv_len. Signed-off-by: Christoph Hellwig Reviewed-by: Johannes Thumshirn Link: https://lore.kernel.org/r/20231204173419.782378-2-hch@lst.de Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/bio.c b/block/bio.c index 816d412c06e9..cef830adbc06 100644 --- a/block/bio.c +++ b/block/bio.c @@ -944,7 +944,7 @@ bool bvec_try_merge_hw_page(struct request_queue *q, struct bio_vec *bv, if ((addr1 | mask) != (addr2 | mask)) return false; - if (bv->bv_len + len > queue_max_segment_size(q)) + if (len > queue_max_segment_size(q) - bv->bv_len) return false; return bvec_try_merge_page(bv, page, len, offset, same_page); } -- 2.43.0