From patchwork Mon Nov 11 20:17:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13871226 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 A7B74D3ABF6 for ; Mon, 11 Nov 2024 20:19:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E406D8D0005; Mon, 11 Nov 2024 15:19:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DE7B58D0001; Mon, 11 Nov 2024 15:19:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B27608D0005; Mon, 11 Nov 2024 15:19:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 927D68D0001 for ; Mon, 11 Nov 2024 15:19:25 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C464C141AD2 for ; Mon, 11 Nov 2024 20:19:24 +0000 (UTC) X-FDA: 82774927830.23.B8902A2 Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by imf26.hostedemail.com (Postfix) with ESMTP id 141DA140021 for ; Mon, 11 Nov 2024 20:18:51 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=toxicpanda-com.20230601.gappssmtp.com header.s=20230601 header.b=qYcJajoX; dmarc=none; spf=none (imf26.hostedemail.com: domain of josef@toxicpanda.com has no SPF policy when checking 209.85.167.172) smtp.mailfrom=josef@toxicpanda.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731356188; a=rsa-sha256; cv=none; b=o4ogkVvsdquJdfShmtWQqCK708HH+nqvjXO/zwwhSzL/fYEzMDPwSkHwqoaom7WEd98omo JbrspwVYzdR66AbUAV9tpxAn2ktHxgZRfeJpc4gyhgK7ik1NYoL9nlKyjS5ASkCMfKMuO/ UQvqMsSgazdL+iwaDUD4uVyilGeV4NQ= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=toxicpanda-com.20230601.gappssmtp.com header.s=20230601 header.b=qYcJajoX; dmarc=none; spf=none (imf26.hostedemail.com: domain of josef@toxicpanda.com has no SPF policy when checking 209.85.167.172) smtp.mailfrom=josef@toxicpanda.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731356188; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BIr6hfiIJt6Z0W2/VohDEaflGJcbA2BZOCByAdmo7A4=; b=vWstQCDmohKDE4Rl3XOJcjoSe+igJ9hw6I5KiGRHCieU15B9l9DonLY5MoZ/Z60gZ79eNT TQ6WDR9E7+Nmo2vrJLJvMUsRucivm3V6ilrAv+uR5QxXbZjzdgRnMB92k3w4heblPHzqrg pQKmG4EgpLhWcOCN19IIzV8lAU790pA= Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3e786167712so3127548b6e.3 for ; Mon, 11 Nov 2024 12:19:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20230601.gappssmtp.com; s=20230601; t=1731356362; x=1731961162; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BIr6hfiIJt6Z0W2/VohDEaflGJcbA2BZOCByAdmo7A4=; b=qYcJajoXyTQpId/D/btBVmWXOwQyduvrt836v5QNijUaQPH6SJ8/G0uymzZjU+ncb4 ozPa+C8WO6F0KGaoN5hvWCivwQ5lfkM/ibRs4360OJoN+1lgIYVlupdBV8vtmcUlc57g 0e0t2veDiAgKO4waQtzfcGwY0FmYmXWsr05kI3SBgu9fJT4XF9w4vLm61N+ZLDtwvLas rBvOklCAlC4jmDRHB94/xF7p6VtjM/obvFuYjr5fenx09Nqdz/Qlx2vSXvjuuwOoXQ1j bMhkCW/2RHRHmYeJQDb1PSimUoVWDduninMpRAL/HydPmp1qapeqZ/HFQYiDr51V2RS+ 5IvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731356362; x=1731961162; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BIr6hfiIJt6Z0W2/VohDEaflGJcbA2BZOCByAdmo7A4=; b=cyIV9KSbRcsRF6HyIDr2HNtDnX+kZAh8RKOtQlCw0qdz5huQjdE5Xbz6R+2Sd9GGaA oxYiad1CykyL4Pty6lhmDYryopHlU557w40oFC+7VEKz46LntsSEfEk1S5OuRTk4xwFb 3LkFkYTuxhOkLwhQ1A1JtH41f2jy41TZK+NUqn22PMGwb6QPj+MkwrfvPvjV/LNwzOsN GaEcuf5Cm8a+mOgjsuSPPIS4A/DyOPM23U2E+u04e5e3vahR0AUTkioqW5tocQmjapS2 Mu9A9JaUlD/tBUyVCVuHKpIEDkCe5HxrVL2I2lWNlJm9DbKaRMZ6ec0OSlrYMgaNqMtD +N5g== X-Forwarded-Encrypted: i=1; AJvYcCX+K3xCECqSaY3ybxw14HQYWJLpIBJ2BHHeNy40Ps+nRjcPPBF2Fk5QSNRlKh4eGB+GSTF1uPs7Ng==@kvack.org X-Gm-Message-State: AOJu0YzGcnO6a2QtNxcvKVswQycUBfHkD8sisRKqTM8HN3SZaexiSQOZ 5TXNlE0CbjOru2A37mYNJFxFWbNyM6EO2NL6RFwiwwv13x+t/dfmeCkWCuh9fZU= X-Google-Smtp-Source: AGHT+IG9bGBtdAa/UNjAV/reMXpITXA7+6iabefhDuqPBQRMez+d/kh/izRimXSRfAf9RRVXnEpYWw== X-Received: by 2002:a05:6358:5d8a:b0:1c2:f482:5c0b with SMTP id e5c5f4694b2df-1c641f66059mr620325055d.24.1731356362041; Mon, 11 Nov 2024 12:19:22 -0800 (PST) Received: from localhost (syn-076-182-020-124.res.spectrum.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d3961f4a0fsm63335146d6.41.2024.11.11.12.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2024 12:19:21 -0800 (PST) From: Josef Bacik To: kernel-team@fb.com, linux-fsdevel@vger.kernel.org, jack@suse.cz, amir73il@gmail.com, brauner@kernel.org, torvalds@linux-foundation.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-mm@kvack.org, linux-ext4@vger.kernel.org Subject: [PATCH v6 08/17] fanotify: introduce FAN_PRE_ACCESS permission event Date: Mon, 11 Nov 2024 15:17:57 -0500 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: hthr85zrsrkw3835zkyfkurekkk5bin3 X-Rspamd-Queue-Id: 141DA140021 X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1731356331-345494 X-HE-Meta: U2FsdGVkX18hfVqyRah+qnmSZgt7zd1tVKcuKsvkvnh4dRtr3zCnfVZCSJH03Bz/Bls+V+DJR8NyHzm/jbvju3B/gdQn7qYAktAUQzj0iBKlZDJsdIqCjJuzfxGDpj3tV9MGJNzFA/OCdQkfiXgvgar1wyQZiQfKP3tpmxemaRY/QimCabx26KkND9E4YoBCPBQI8uhGnJuM4ZXnJXLDs0u816GQSbSrYQSlDEpdyChTPXl/ilQvOk0zfSKVC0kAJY1bBhAzjWemAsHAHGFB2KCIWDgtM+FOHGKwU84DBQk00yzHorSSogYwVmyBGc7fSd0JYQXFACEV3Mh/JaG4qlO6oQxKHwr86OYkShHbgsNlvabpo43yGiWurYTP7KXCwJsJgYo1jM67gF54kKrSy9tvYButfUfBDp4QtkK2TY/e6KYuTNdfDixmOEh2pZPap+TTKhXV3uOWeDnrlKp4Bw4T742CIVYhvVR7m0ge9QQOvJrKb3OnYivx4YQst+jjjE2kuWVG4Wcy1ijFOEVHzZjPjLnh3HCltGYgNufb7twoglMZn4qJ3YDu3TP9pUgNAs7+I7TvcKC8jTcBO/+/GD3GQvGoQhCOXr5kYzSPp9Rc9YG3S0MjwzqxJnX/EP8OUnyhd28KNSaSKWCCPk0FyQQyVFQq0Nt7nh4oHBr1/tHzpkmrsIeFB1Hnprd7QmxJ05A51iUXKGpF4CKax4RU8MThTMAg7b8zkYeBt4qIJc2seElbjsJ7wPH37HPBe4G/Jo/fgYsAoDM6sn4ThVWrZaGAgLCibmEBfbSYi6vJ0gi0MzTsJaVsGfFz2zOrPxUDruI9aJpkJRDvpzFRyDZgfqGir2Z+io5gyoyhy0lulLnn/Nvf9jVobVRwIC/Vytka5sdNNZbfaU0/rjVLad0dSncBGqSpxXKjaGPGK2WnaECRwx5+H/Bi9bwxCEVZC5yOftt30k+FRjqQr62yKjO ZVpQEdAe Qc9RM8YpUZQd7/jXIbW15p9R8i47BpBaqyv2fbxwjrW4DAzwpnE7yooXFpc2YSDTstYYKWjDSTB/RMyg2My2tcDLapMcFTK+laIUsTPub/b0gFnut+zOFSo9DkmwLT6CHMEIpgn6h59mW9I6KoV/N62qfEwVAQ/PygrbMJ3NjUtQeVKK+vTlYIzlY2LJXLkf/Hbk3JmeIKPDZBfUSgpDak7o+AkPGHjecpiTYG0yasGBJdgr5V/5cANHEv2otSuzUcOD0Al3uXiGodY88lxU3adtQ1AOadMshFmLwCm7L2hCmtGHL1ZRuaXhmA/m8VwWXR0YYffpgKsAUQ+7xbwGpPr6CEM/3gTMvQMXvkAvswS5F5+yfa5rAHMfg9I0q8YEyxToB X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Amir Goldstein Similar to FAN_ACCESS_PERM permission event, but it is only allowed with class FAN_CLASS_PRE_CONTENT and only allowed on regular files and dirs. Unlike FAN_ACCESS_PERM, it is safe to write to the file being accessed in the context of the event handler. This pre-content event is meant to be used by hierarchical storage managers that want to fill the content of files on first read access. Signed-off-by: Amir Goldstein --- fs/notify/fanotify/fanotify.c | 3 ++- fs/notify/fanotify/fanotify_user.c | 22 +++++++++++++++++++--- include/linux/fanotify.h | 14 ++++++++++---- include/uapi/linux/fanotify.h | 2 ++ 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index c1e4ae221093..5e05410ddb9f 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -917,8 +917,9 @@ static int fanotify_handle_event(struct fsnotify_group *group, u32 mask, BUILD_BUG_ON(FAN_OPEN_EXEC_PERM != FS_OPEN_EXEC_PERM); BUILD_BUG_ON(FAN_FS_ERROR != FS_ERROR); BUILD_BUG_ON(FAN_RENAME != FS_RENAME); + BUILD_BUG_ON(FAN_PRE_ACCESS != FS_PRE_ACCESS); - BUILD_BUG_ON(HWEIGHT32(ALL_FANOTIFY_EVENT_BITS) != 21); + BUILD_BUG_ON(HWEIGHT32(ALL_FANOTIFY_EVENT_BITS) != 22); mask = fanotify_group_event_mask(group, iter_info, &match_mask, mask, data, data_type, dir); diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 0ae4cd87e712..da9cf09565ce 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -1639,11 +1639,23 @@ static int fanotify_events_supported(struct fsnotify_group *group, unsigned int flags) { unsigned int mark_type = flags & FANOTIFY_MARK_TYPE_BITS; + bool is_dir = d_is_dir(path->dentry); /* Strict validation of events in non-dir inode mask with v5.17+ APIs */ bool strict_dir_events = FAN_GROUP_FLAG(group, FAN_REPORT_TARGET_FID) || (mask & FAN_RENAME) || (flags & FAN_MARK_IGNORE); + /* + * Filesystems need to opt-into pre-content evnets (a.k.a HSM) + * and they are only supported on regular files and directories. + */ + if (mask & FANOTIFY_PRE_CONTENT_EVENTS) { + if (!(path->mnt->mnt_sb->s_iflags & SB_I_ALLOW_HSM)) + return -EINVAL; + if (!is_dir && !d_is_reg(path->dentry)) + return -EINVAL; + } + /* * Some filesystems such as 'proc' acquire unusual locks when opening * files. For them fanotify permission events have high chances of @@ -1676,7 +1688,7 @@ static int fanotify_events_supported(struct fsnotify_group *group, * but because we always allowed it, error only when using new APIs. */ if (strict_dir_events && mark_type == FAN_MARK_INODE && - !d_is_dir(path->dentry) && (mask & FANOTIFY_DIRONLY_EVENT_BITS)) + !is_dir && (mask & FANOTIFY_DIRONLY_EVENT_BITS)) return -ENOTDIR; return 0; @@ -1780,11 +1792,15 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask, goto fput_and_out; /* - * Permission events require minimum priority FAN_CLASS_CONTENT. + * Permission events are not allowed for FAN_CLASS_NOTIF. + * Pre-content permission events are not allowed for FAN_CLASS_CONTENT. */ ret = -EINVAL; if (mask & FANOTIFY_PERM_EVENTS && - group->priority < FSNOTIFY_PRIO_CONTENT) + group->priority == FSNOTIFY_PRIO_NORMAL) + goto fput_and_out; + else if (mask & FANOTIFY_PRE_CONTENT_EVENTS && + group->priority == FSNOTIFY_PRIO_CONTENT) goto fput_and_out; if (mask & FAN_FS_ERROR && diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h index 89ff45bd6f01..c747af064d2c 100644 --- a/include/linux/fanotify.h +++ b/include/linux/fanotify.h @@ -89,6 +89,16 @@ #define FANOTIFY_DIRENT_EVENTS (FAN_MOVE | FAN_CREATE | FAN_DELETE | \ FAN_RENAME) +/* Content events can be used to inspect file content */ +#define FANOTIFY_CONTENT_PERM_EVENTS (FAN_OPEN_PERM | FAN_OPEN_EXEC_PERM | \ + FAN_ACCESS_PERM) +/* Pre-content events can be used to fill file content */ +#define FANOTIFY_PRE_CONTENT_EVENTS (FAN_PRE_ACCESS) + +/* Events that require a permission response from user */ +#define FANOTIFY_PERM_EVENTS (FANOTIFY_CONTENT_PERM_EVENTS | \ + FANOTIFY_PRE_CONTENT_EVENTS) + /* Events that can be reported with event->fd */ #define FANOTIFY_FD_EVENTS (FANOTIFY_PATH_EVENTS | FANOTIFY_PERM_EVENTS) @@ -104,10 +114,6 @@ FANOTIFY_INODE_EVENTS | \ FANOTIFY_ERROR_EVENTS) -/* Events that require a permission response from user */ -#define FANOTIFY_PERM_EVENTS (FAN_OPEN_PERM | FAN_ACCESS_PERM | \ - FAN_OPEN_EXEC_PERM) - /* Extra flags that may be reported with event or control handling of events */ #define FANOTIFY_EVENT_FLAGS (FAN_EVENT_ON_CHILD | FAN_ONDIR) diff --git a/include/uapi/linux/fanotify.h b/include/uapi/linux/fanotify.h index 79072b6894f2..7596168c80eb 100644 --- a/include/uapi/linux/fanotify.h +++ b/include/uapi/linux/fanotify.h @@ -27,6 +27,8 @@ #define FAN_OPEN_EXEC_PERM 0x00040000 /* File open/exec in perm check */ /* #define FAN_DIR_MODIFY 0x00080000 */ /* Deprecated (reserved) */ +#define FAN_PRE_ACCESS 0x00100000 /* Pre-content access hook */ + #define FAN_EVENT_ON_CHILD 0x08000000 /* Interested in child events */ #define FAN_RENAME 0x10000000 /* File was renamed */