Received: by 2002:a05:7412:419a:b0:f3:1519:9f41 with SMTP id i26csp1279698rdh; Fri, 24 Nov 2023 08:49:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IGgnKW/ejvJrHc+UzsvSrg5SV4zLcYDx5Yhtts3ZuQ0VS0J50k+KM9Bf3E/LfH8ZNePrD29 X-Received: by 2002:a05:6a21:3386:b0:17a:e941:b0a3 with SMTP id yy6-20020a056a21338600b0017ae941b0a3mr4092966pzb.39.1700844547776; Fri, 24 Nov 2023 08:49:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700844547; cv=none; d=google.com; s=arc-20160816; b=AQhVTzAl+R1yVOPypQ89HFB9HJliHdnTEFt5SaD+vCMNj8sb2gz2OBED7LmKG0qnVm vjEVby+NgqKnBhC/ytrYBGLMUgYBUUVJ6Ug1bycOIA19OArL8p8gr9f96lTF6H+Mdhe8 T5oKZpWbnSFmHM7xSEyOV3QqvrF23ZZD1T52IQ/x2giF1fDT3rPG1ctNm94TiK4tjOx5 BfKwsBhEN7NJgsFYS4+GUbIKiK+/n4F3syxUpKw9rzR4mTrmkoZffxpRHq3c0JQoKqks MbAWMZLl2VzPerDvEJJJDuqLWerlaT3Kx5rs/G+SE9UZ0YH8invwso3hUq4NVyZP9n2C S+pA== 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=1dT0G2gbK38DhronxeBhd+QT3xLvMQeHXnzz480DWvs=; fh=4k+0GS8EVT2MomLfveVVccIW83Eab0LXWHriikBuhDI=; b=jBAnX1Mb+QbFyceIF5/gc0OgZiEBUU1ewWSDdUr0SR0A7ER7FfimnEA3CfCzPti0hY gjwDGjpDhBWR+LoJbzV1WaB/WZIHuhIiRHbqWyMgyhx3bbcUF8rBBNueliWH60AkdzgK d1Orjz38KzPeAiLC2un3BFSPST9Fle0vcCXCXeCqVJoRij0fqGnRpM8oEGI5MS5B3Rh+ x4iP0Ihh/TSIlMR9hXkqhRI0fjscXAfFxLPgIvaNy8IMvxukF4C5fpdqwOuNOdam2/Zj rMBPUTwiHtChN4HmKw3wol8ddDerl7z9jOVKV8yEUOzE4uVjq1OEdNF7FaxGCprmAnNt sDEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=4OkkkphA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id a20-20020a63e854000000b005ac4854b202si3939563pgk.321.2023.11.24.08.49.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 08:49:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=4OkkkphA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 3545980789AB; Fri, 24 Nov 2023 08:49:05 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231365AbjKXQss (ORCPT + 99 others); Fri, 24 Nov 2023 11:48:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231327AbjKXQsr (ORCPT ); Fri, 24 Nov 2023 11:48:47 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75F48173D for ; Fri, 24 Nov 2023 08:48:53 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40b367a0a12so108005e9.1 for ; Fri, 24 Nov 2023 08:48:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700844532; x=1701449332; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1dT0G2gbK38DhronxeBhd+QT3xLvMQeHXnzz480DWvs=; b=4OkkkphAtLvN8ZVjIZtBNL9hKsLCrAF+OsMfE1A9+akr/Z+cqgyP88X26Gw+xxle+S 7kXy0FonuEZnKwzx6s4Dc/7Kg0aaWazkf96LaFzoNZBOasoHJgfk5+ixf+XrBS/tdeF2 YW7q+ZsLluW46RNJk0aU+4IfKWnm2ugD0+ibtZaiu3eNquTGPMzNlIrnBDdRxx56keCa g8WgCwK+zXqCr2tciL8fPbA59M6V2u66wXhpCkASqMsu1h8Ve6py4jl3BJOTSR/sxSGo 7Wla9LO6yUroLb3yqUSXZ5OftmmARz54XkTsvZ7h6K+8Jg9VUjP0yJx7UDozolM7YDuP 0aqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700844532; x=1701449332; 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=1dT0G2gbK38DhronxeBhd+QT3xLvMQeHXnzz480DWvs=; b=mTAROIK635JXp7QLjLtOtpBjH5ir5hhxFi7JbHpPblFlkNnE9Z8Xw1me4Ewd+Rlobx 9MhRR6Yesf6hKMckVtxv5gbVHa0YGfr9d6Q7zKzq3+H1lpyooujyCi2H1HA6oUQaYpA+ IUUj7EA08+YziCQd1aFGe0mDz+3VvMt9iXY6NmVtJ7iKfdpBEPMFuFg/ZaNcPJoLgtto bSL301SDzfPWR8TFFi4XQQw7dfmU3TypTOSFfeKnWkktxtg64G7RVkf2oE1iNE+6n196 GgJ6ZFeaUk+eIRSQ01a8z6Y6smXPRou6oF77BbvgsNNyh9wDtw0+vh/mOqTzUwa7+tCb fRGw== X-Gm-Message-State: AOJu0YwUwKRU7d/8Y3QcH8W7nngKDD1nyW/Hzguo8fAzmD8jbD8lReON bmbGzgu/qVA5/oZXsiELaitVaQ== X-Received: by 2002:a05:600c:4f44:b0:408:3727:92c5 with SMTP id m4-20020a05600c4f4400b00408372792c5mr394412wmq.2.1700844531642; Fri, 24 Nov 2023 08:48:51 -0800 (PST) Received: from localhost ([2a00:79e0:9d:4:4ea2:a7ce:d5d3:86af]) by smtp.gmail.com with ESMTPSA id h11-20020a5d504b000000b0032d96dd703bsm4706487wrt.70.2023.11.24.08.48.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 08:48:50 -0800 (PST) From: Jann Horn To: Chris Mason , Josef Bacik , David Sterba Cc: Alex Lyakas , Alexander Block , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com Subject: [PATCH] btrfs: send: Ensure send_fd is writable Date: Fri, 24 Nov 2023 17:48:31 +0100 Message-ID: <20231124164831.2191549-1-jannh@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 24 Nov 2023 08:49:05 -0800 (PST) kernel_write() requires the caller to ensure that the file is writable. Let's do that directly after looking up the ->send_fd. (We don't need a separate bailout path because the "out" path already does fput() if ->send_filp is non-NULL.) This has no security impact for two reasons: - the ioctl requires CAP_SYS_ADMIN - __kernel_write() bails out on read-only files - but only since 5.8, see commit a01ac27be472 ("fs: check FMODE_WRITE in __kernel_write") Reported-and-tested-by: syzbot+12e098239d20385264d3@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=12e098239d20385264d3 Fixes: 31db9f7c23fb ("Btrfs: introduce BTRFS_IOC_SEND for btrfs send/receive") Cc: stable@vger.kernel.org Signed-off-by: Jann Horn --- fs/btrfs/send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 3b929f0e8f04..4e36550618e5 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -8158,7 +8158,7 @@ long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg) } sctx->send_filp = fget(arg->send_fd); - if (!sctx->send_filp) { + if (!sctx->send_filp || !(sctx->send_filp->f_mode & FMODE_WRITE)) { ret = -EBADF; goto out; } base-commit: 98b1cc82c4affc16f5598d4fa14b1858671b2263 -- 2.43.0.rc1.413.gea7ed67945-goog