Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp538676rwi; Thu, 20 Oct 2022 01:57:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6PYdrYuIR2JH1nn1xcijokqSEZe1dmO0PIx/46+HbFqF/Tc8Cj+MPucFBIErE1qwLTjn6h X-Received: by 2002:a17:906:9746:b0:78e:11cc:3bb3 with SMTP id o6-20020a170906974600b0078e11cc3bb3mr10096363ejy.379.1666256260933; Thu, 20 Oct 2022 01:57:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666256260; cv=none; d=google.com; s=arc-20160816; b=GjVAp4xo9SegxDREK9DKaWMAb0YRhrw8RXwpFDwC/1apTFw2x4/Suc8LBxN8lhcLB2 R91h5J5S9iif+mWemnRYIqvPdbU/JbdtMI2hHwIT4c2/AuaSuWTeyXUQj21zRTHJX3GD rGA30GgOiyWHBPmnsRoC6SVw9qC8OMCy0fTouGH57xkOdhRYGDp+mXakzHaLzVx80+o5 0etnH5tzsgivRDc92ylfjtifcjhSkTCas57P9ek5tFz2Ny/ldsR7mc6H8KVho9xkdXw1 oOvK8bYWWA5XmsKTihIRfRTIIFsbTM+bxl5X5hCU6oe50pMaeTzB/VTe/0fUDVhcb1JX M+rg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=fxJKiEotGSWnJtU5023vvPUDcYNa2O9fl/RCysq+NZA=; b=oY/xUgNqRv10twaJACSh5YCzrRYJGe48GfUYqRxcn4fx/Bkm8+KSqq7Q9Si80/Zyz1 EWXueuYprGMGlNc+jYpc/1j3DyOSFc4/uDgt+akGEnsSsAAPmXjaxu3Z8cectQ3/q2Ig pp0hVAr1DZaNmd2UVEcVumvurXX7p5DZ+QwJQM+sAv/E42HxO83tpceQfXDm1Owat+uZ 9GtRZ9oNkS2h97VP5JNz9/5S0LQ1KJt3fUKl3shxLz8DiG3/aYnfEwy2MhMS9+q2AEJt qUADTbQfF6biW/28yXY0VzhOouQLBKH/aSTPdSMl9BCAqOth7Cmib+j2674rjd96CgvL U6pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=CmP3VgGn; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p11-20020a056402500b00b0045cca8f9a0asi19097806eda.580.2022.10.20.01.57.15; Thu, 20 Oct 2022 01:57:40 -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=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=CmP3VgGn; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229864AbiJTIxV (ORCPT + 99 others); Thu, 20 Oct 2022 04:53:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230361AbiJTIwz (ORCPT ); Thu, 20 Oct 2022 04:52:55 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 505A7192B8C for ; Thu, 20 Oct 2022 01:52:53 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id bp11so33236629wrb.9 for ; Thu, 20 Oct 2022 01:52:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fxJKiEotGSWnJtU5023vvPUDcYNa2O9fl/RCysq+NZA=; b=CmP3VgGnictPB7LKKm5de97ljCHY369aWKMvv2xLSdFmS2DeCVFc6Z9czgE1Dk/U7/ VyK1kIEbW0pmuuLffv8j6kySncqAJ8V9/FDA1rg8qQGVo3ke0WGrPRmcg2urSSs29hxk LBg3V8XSAVOzs2K7dp1kc8pTw4iPmcmRHqJdR1vWCDbpsTEG9crmhrOB3HYQYGUODobE jAVnxtjHyfPe2VgdaZn00vNh09lrjBVkifh2je1viTI9LGoZpAkogxDSA5IoWxLEoTj5 YemzS5ly8MaTIiJIdGpBIk8eFHW+wOLh6jfbyP6OB20QNb0LgRCgvIR80Rm21DN6wlOX AF/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fxJKiEotGSWnJtU5023vvPUDcYNa2O9fl/RCysq+NZA=; b=Mbi3UDXgY5QLHIEVsNIJpemBXU5JimEbHQq1KsVogasScr2lEf4oSiZGajtEVz5kDY vrG6DvUHon9SPFnqcZOSb1WT55BHzWAE811Bz5qbXOvKCe+hiI62ebUMTeuFrFiZFXxx jAv0Y2MHPBI5rAYfVwS9Lyb1l0+BDsKVqi0jODScM9pR3qVvwv/gLyMMCJ16YSplup9J oQ1+CHY+BOL/tVh6CqVV5d1jodn/jgfPUSX85+0q1JSLzAUeZ3VcHfYX7xc3gEmQXDgT 7RJ17fAoebEn4iklQnmbvuKPqNfYZ4x49Bdnz/SkQcobyzO5ECKYp+Cv+bionzXlOJlU Vf0A== X-Gm-Message-State: ACrzQf1/XpxLagkS4XWO7yckT/mcNtS5rOb1Ek+hBQbVhIO8/6wEcym6 3U1BMvXHtxTcLMBKcEpRbbkLThqQJLKHsV44 X-Received: by 2002:a5d:4683:0:b0:22e:6be0:dfc6 with SMTP id u3-20020a5d4683000000b0022e6be0dfc6mr7915288wrq.573.1666255970764; Thu, 20 Oct 2022 01:52:50 -0700 (PDT) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id f10-20020a05600c4e8a00b003a84375d0d1sm2409409wmq.44.2022.10.20.01.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 01:52:50 -0700 (PDT) From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= , Joel Colledge , Christoph Hellwig Subject: [PATCH v2] drbd: only clone bio if we have a backing device Date: Thu, 20 Oct 2022 10:52:05 +0200 Message-Id: <20221020085205.129090-1-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 Commit c347a787e34cb (drbd: set ->bi_bdev in drbd_req_new) moved a bio_set_dev call (which has since been removed) to "earlier", from drbd_request_prepare to drbd_req_new. The problem is that this accesses device->ldev->backing_bdev, which is not NULL-checked at this point. When we don't have an ldev (i.e. when the DRBD device is diskless), this leads to a null pointer deref. So, only allocate the private_bio if we actually have a disk. This is also a small optimization, since we don't clone the bio to only to immediately free it again in the diskless case. Fixes: c347a787e34cb ("drbd: set ->bi_bdev in drbd_req_new") Co-developed-by: Christoph Böhmwalder Signed-off-by: Christoph Böhmwalder Co-developed-by: Joel Colledge Signed-off-by: Joel Colledge Reviewed-by: Christoph Hellwig --- Changes in v2: - Fix an overly long line --- drivers/block/drbd/drbd_req.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 8f7f144e54f3..7f9bcc82fc9c 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -30,11 +30,6 @@ static struct drbd_request *drbd_req_new(struct drbd_device *device, struct bio return NULL; memset(req, 0, sizeof(*req)); - req->private_bio = bio_alloc_clone(device->ldev->backing_bdev, bio_src, - GFP_NOIO, &drbd_io_bio_set); - req->private_bio->bi_private = req; - req->private_bio->bi_end_io = drbd_request_endio; - req->rq_state = (bio_data_dir(bio_src) == WRITE ? RQ_WRITE : 0) | (bio_op(bio_src) == REQ_OP_WRITE_ZEROES ? RQ_ZEROES : 0) | (bio_op(bio_src) == REQ_OP_DISCARD ? RQ_UNMAP : 0); @@ -1219,9 +1214,12 @@ drbd_request_prepare(struct drbd_device *device, struct bio *bio) /* Update disk stats */ req->start_jif = bio_start_io_acct(req->master_bio); - if (!get_ldev(device)) { - bio_put(req->private_bio); - req->private_bio = NULL; + if (get_ldev(device)) { + req->private_bio = bio_alloc_clone(device->ldev->backing_bdev, + bio, GFP_NOIO, + &drbd_io_bio_set); + req->private_bio->bi_private = req; + req->private_bio->bi_end_io = drbd_request_endio; } /* process discards always from our submitter thread */ -- 2.37.3