From patchwork Thu May 25 21:48:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 99228 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp76994vqr; Thu, 25 May 2023 15:13:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6aWM+0xjwImTVcTtMLLldps+srzb4iZIp7CKADgzxRrvNBRdwJgHpULv4rHH59FOBgYYjS X-Received: by 2002:a17:902:c410:b0:1ad:fcdc:2a9f with SMTP id k16-20020a170902c41000b001adfcdc2a9fmr151871plk.51.1685052821703; Thu, 25 May 2023 15:13:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685052821; cv=none; d=google.com; s=arc-20160816; b=saQXXvNKwWkvDSihFqYkp4xOxlCidWtqdtzMMiwj/6+GCGZt4d3dZdQsSrc4tJYw1Z XwrbbWL+a7iuUcS698x8gd/MC1F9ckRu/VhzU5FkNPEx2Lop2SXnDwzqkAYikwqlBEg/ 5zD3+h625m3i9ao3b8Qh9g6hidHtfeDrzNtC1ufftnnGPQkX9HDwbdiNsuJa6OMdn6iN A/XCuEucdnRU0wfZ+6D5K48N6Rh8uzRJEJs+9CyFoEzztRxIC6VkkB7TgZrvLHURXbNh NCx52e/pelc9lMcHrbDxyjlcpDigOQvR93ZMfZqyw4JekaW6Xa7nw3garNpZfWNUhiNg SUuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=t8R8a1McseA9yHEzYOxyXGPVlvlW3Oa2+9zEDFiMSek=; b=mAseFGas4x9RwKsmi3GHkRuiI7gNLmIi1mAJ3pU/nlRyZuLydMjjM0uqqZjgpe5fwL cz99a2KWG345P06m7JyqCMnbvNB5A6qCO2svyEDTc0s57vytCBftCrgkCv3ftzOsR2dO tJKxeJfwHLwSYVpLJBWZSTosRc4anRxt1FwZt5kvzk75bZu5RIxjc7CpiFqVeqT5YeAL vlDAPOdM0kMeLcQg8mEQMaixx0bkGfo43gzseYRiFr+MIfbaeFSNaEDhBBGxQVLPyn7F Ih+5Hdzl4J24Cnb8jFIRJZfQNKZi0CWaBBJxN2cbNWpDaIXTuLkW6BdteIJNw4vWKip6 jdig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=ggHAXBan; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 5-20020a170902e9c500b001a6458c9f96si2422008plk.37.2023.05.25.15.13.27; Thu, 25 May 2023 15:13:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=ggHAXBan; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242003AbjEYVtC (ORCPT + 99 others); Thu, 25 May 2023 17:49:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235261AbjEYVso (ORCPT ); Thu, 25 May 2023 17:48:44 -0400 Received: from out-8.mta1.migadu.com (out-8.mta1.migadu.com [95.215.58.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40A3299 for ; Thu, 25 May 2023 14:48:41 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1685051319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t8R8a1McseA9yHEzYOxyXGPVlvlW3Oa2+9zEDFiMSek=; b=ggHAXBanEtrsF3Bw6NBbcErQG27OLHdzER6fR1tKOaIZ+UxdklUDO9CjHGMylYPF8hjYYa JCJMbNS42iRiKS1tTjfnAhXHw1ipsVyyDxg5qO4i1o+cw8BKqHSlsjOqDGoKZbfPxvKVi4 ZAMsPzraoKPmoCl6zo/nWtGPjfTQsjI= From: Kent Overstreet To: linux-kernel@vger.kernel.org, axboe@kernel.dk Cc: Kent Overstreet , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 2/7] block: Allow bio_iov_iter_get_pages() with bio->bi_bdev unset Date: Thu, 25 May 2023 17:48:17 -0400 Message-Id: <20230525214822.2725616-3-kent.overstreet@linux.dev> In-Reply-To: <20230525214822.2725616-1-kent.overstreet@linux.dev> References: <20230525214822.2725616-1-kent.overstreet@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766905947453864366?= X-GMAIL-MSGID: =?utf-8?q?1766905947453864366?= bio_iov_iter_get_pages() trims the IO based on the block size of the block device the IO will be issued to. However, bcachefs is a multi device filesystem; when we're creating the bio we don't yet know which block device the bio will be submitted to - we have to handle the alignment checks elsewhere. Thus this is needed to avoid a null ptr deref. Signed-off-by: Kent Overstreet Cc: Jens Axboe Cc: linux-block@vger.kernel.org --- block/bio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/block/bio.c b/block/bio.c index 1e75840d17..e74a04ea14 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1245,7 +1245,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) struct page **pages = (struct page **)bv; ssize_t size, left; unsigned len, i = 0; - size_t offset, trim; + size_t offset; int ret = 0; /* @@ -1274,10 +1274,12 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) nr_pages = DIV_ROUND_UP(offset + size, PAGE_SIZE); - trim = size & (bdev_logical_block_size(bio->bi_bdev) - 1); - iov_iter_revert(iter, trim); + if (bio->bi_bdev) { + size_t trim = size & (bdev_logical_block_size(bio->bi_bdev) - 1); + iov_iter_revert(iter, trim); + size -= trim; + } - size -= trim; if (unlikely(!size)) { ret = -EFAULT; goto out;