From patchwork Sun Dec 2 11:38:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10707979 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6C18316B1 for ; Sun, 2 Dec 2018 11:38:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DB1D2AEB6 for ; Sun, 2 Dec 2018 11:38:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EED92AEBA; Sun, 2 Dec 2018 11:38:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEB912AE9F for ; Sun, 2 Dec 2018 11:38:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725850AbeLBLiw (ORCPT ); Sun, 2 Dec 2018 06:38:52 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:50934 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbeLBLiv (ORCPT ); Sun, 2 Dec 2018 06:38:51 -0500 Received: by mail-wm1-f66.google.com with SMTP id n190so531961wmd.0; Sun, 02 Dec 2018 03:38:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uvafxpOEJamXtRndZ82nEzQQ03gZeMaXE26svQkttWE=; b=HLgE9MaHAjy9R7QtX0Dh7I+faPh71xL3eV+PY4vYbCT9M2LN9eaqar6gbYybYZlwmw AqUr1wQ6fyTV5FL85DhmwVXtt14kIkWrFnFIXuNHV2G1US1OwEUxRqeQ1bdemSfxshFv iiHOyoXyzZrkiLecyvGkhczrhTQlKFTsEAQxS8dH66Guymt9zE+qbq0U996gNLBHPhfy ouIJzLDflftmKlbMDPCQEY1kZhgTKvi5gCKGdbF3XZF2s8JbyAs9XGVGwUqb5hYQhsGw oLHYPmTOmts98E3ke9ttmy/2gOJ0Ybu+yXPVObEu8iEQ4hPqDxMZIq0UxzwlCqzdVwMD UhgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uvafxpOEJamXtRndZ82nEzQQ03gZeMaXE26svQkttWE=; b=dTBADy6MF+SIxCiTACTQSeED8s5UEyYxMKhr8aXnOteYEbNChnZmvppr73Yhfu/WKE RJexK14xjOthM7e0TstkSqq88/XqtCJ2PURmHE0Jipql84uT4VCMYUW3vk/XrduMKT9F KAwO2Bydw+GIq4fOpJpbHOLpKv8cKqxV2Cp3nk8VnIgeGw+vNlru0edRmAxwdxxotQ68 HqNDqty+/YkqRMkxpixARP0cPITgUTMzni/wE/m9rJdUvep2/lTojesCWftUbadqTrmj riyDK9OdLA9GWlwEdDEuIchmDqJA42Rgs9i+fYt2y1sheATq8mhMbjE6X6P2Dw9RtL1o Ev6g== X-Gm-Message-State: AA+aEWbNb4hUSUZ7034iXBFN0XkpA+THG5krjzQ12miik5F6y5UxcD0k TNySNUGcx1LJyJY8MIRmDl4= X-Google-Smtp-Source: AFSGD/WPh8i3vRultw47y71xkI0/IE2enmRk+hTOHSJHqLT9ITZ2HVTrMXNfuBrkhEnL9A7P1xiXRA== X-Received: by 2002:a1c:3a8d:: with SMTP id h135-v6mr4732235wma.92.1543750725745; Sun, 02 Dec 2018 03:38:45 -0800 (PST) Received: from localhost.localdomain (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id c3-v6sm3448672wmb.46.2018.12.02.03.38.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Dec 2018 03:38:45 -0800 (PST) From: Amir Goldstein To: Jan Kara Cc: Matthew Bobrowski , linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org Subject: [PATCH v4 07/15] fanotify: copy event fid info to user Date: Sun, 2 Dec 2018 13:38:18 +0200 Message-Id: <20181202113826.32133-8-amir73il@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181202113826.32133-1-amir73il@gmail.com> References: <20181202113826.32133-1-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If group requested FAN_REPORT_FID and event has file identifier, copy that information to user reading the event after event metadata. fid information is formatted as struct fanotify_event_info_fid that includes a generic header struct fanotify_event_info_header, so that other info types could be defined in the future using the same header. metadata->event_len includes the length of the fid information. The fid information includes the filesystem's fsid (see statfs(2)) followed by an NFS file handle of the file that could be passed as an argument to open_by_handle_at(2). Cc: Signed-off-by: Amir Goldstein --- fs/notify/fanotify/fanotify.h | 5 ++ fs/notify/fanotify/fanotify_user.c | 85 ++++++++++++++++++++++++++++-- include/uapi/linux/fanotify.h | 20 +++++++ 3 files changed, 105 insertions(+), 5 deletions(-) diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h index cddebea5ff67..265fbaa2d5b7 100644 --- a/fs/notify/fanotify/fanotify.h +++ b/fs/notify/fanotify/fanotify.h @@ -99,6 +99,11 @@ static inline bool fanotify_event_has_ext_fh(struct fanotify_event *event) !fanotify_inline_fh_len(event->fh_len); } +static inline void *fanotify_event_fh(struct fanotify_event *event) +{ + return fanotify_fid_fh(&event->fid, event->fh_len); +} + /* * Structure for permission fanotify events. It gets allocated and freed in * fanotify_handle_event() since we wait there for user response. When the diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 9b9e6704f9e7..032a9a225a21 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -47,6 +47,22 @@ struct kmem_cache *fanotify_mark_cache __read_mostly; struct kmem_cache *fanotify_event_cachep __read_mostly; struct kmem_cache *fanotify_perm_event_cachep __read_mostly; +static int fanotify_event_info_len(struct fanotify_event *event) +{ + if (!fanotify_event_has_fid(event)) + return 0; + + return sizeof(struct fanotify_event_info_fid) + + sizeof(struct file_handle) + event->fh_len; +} + +#define FANOTIFY_EVENT_ALIGN (sizeof(void *)) + +static int fanotify_round_event_info_len(struct fanotify_event *event) +{ + return roundup(fanotify_event_info_len(event), FANOTIFY_EVENT_ALIGN); +} + /* * Get an fsnotify notification event if one exists and is small * enough to fit in "count". Return an error pointer if the count @@ -57,6 +73,9 @@ struct kmem_cache *fanotify_perm_event_cachep __read_mostly; static struct fsnotify_event *get_one_event(struct fsnotify_group *group, size_t count) { + size_t event_size = FAN_EVENT_METADATA_LEN; + struct fanotify_event *event; + assert_spin_locked(&group->notification_lock); pr_debug("%s: group=%p count=%zd\n", __func__, group, count); @@ -64,11 +83,18 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group, if (fsnotify_notify_queue_is_empty(group)) return NULL; - if (FAN_EVENT_METADATA_LEN > count) + if (FAN_GROUP_FLAG(group, FAN_REPORT_FID)) { + event = FANOTIFY_E(fsnotify_peek_first_event(group)); + event_size += fanotify_round_event_info_len(event); + } + + if (event_size > count) return ERR_PTR(-EINVAL); - /* held the notification_lock the whole time, so this is the - * same event we peeked above */ + /* + * Held the notification_lock the whole time, so this is the + * same event we peeked above + */ return fsnotify_remove_first_event(group); } @@ -174,6 +200,47 @@ static int process_access_response(struct fsnotify_group *group, return 0; } +static int copy_fid_to_user(struct fanotify_event *event, char __user *buf) +{ + struct fanotify_event_info_fid info; + struct file_handle handle; + size_t fh_len = event->fh_len; + size_t info_len = fanotify_event_info_len(event); + size_t len = roundup(info_len, FANOTIFY_EVENT_ALIGN); + + if (!info_len) + return 0; + + /* Copy event info fid header followed by vaiable sized file handle */ + info.hdr.info_type = FAN_EVENT_INFO_TYPE_FID; + info.hdr.len = info_len; + info.fsid = event->fid.fsid; + info_len = sizeof(info) + sizeof(struct file_handle); + if (copy_to_user(buf, &info, sizeof(info))) + return -EFAULT; + + buf += sizeof(info); + len -= sizeof(info); + handle.handle_type = event->fh_type; + handle.handle_bytes = event->fh_len; + if (copy_to_user(buf, &handle, sizeof(handle))) + return -EFAULT; + + buf += sizeof(handle); + len -= sizeof(handle); + if (copy_to_user(buf, fanotify_event_fh(event), fh_len)) + return -EFAULT; + + /* Pad with 0's */ + buf += fh_len; + len -= fh_len; + WARN_ON_ONCE(len < 0 || len >= FANOTIFY_EVENT_ALIGN); + if (len > 0 && clear_user(buf, len)) + return -EFAULT; + + return 0; +} + static ssize_t copy_event_to_user(struct fsnotify_group *group, struct fsnotify_event *fsn_event, char __user *buf) @@ -197,18 +264,26 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, fd = create_fd(group, event, &f); if (fd < 0) return fd; + } else if (fanotify_event_has_fid(event)) { + metadata.event_len += fanotify_round_event_info_len(event); } metadata.fd = fd; ret = -EFAULT; - if (copy_to_user(buf, &metadata, metadata.event_len)) + if (copy_to_user(buf, &metadata, FAN_EVENT_METADATA_LEN)) goto out_close_fd; if (fanotify_is_perm_event(event->mask)) FANOTIFY_PE(fsn_event)->fd = fd; - if (fd != FAN_NOFD) + if (fanotify_event_has_path(event)) { fd_install(fd, f); + } else if (fanotify_event_has_fid(event)) { + ret = copy_fid_to_user(event, buf + FAN_EVENT_METADATA_LEN); + if (ret < 0) + return ret; + } + return metadata.event_len; out_close_fd: diff --git a/include/uapi/linux/fanotify.h b/include/uapi/linux/fanotify.h index d07f3cbc2786..959ae2bdc7ca 100644 --- a/include/uapi/linux/fanotify.h +++ b/include/uapi/linux/fanotify.h @@ -107,6 +107,26 @@ struct fanotify_event_metadata { __s32 pid; }; +#define FAN_EVENT_INFO_TYPE_FID 1 + +/* Variable length info record following event metadata */ +struct fanotify_event_info_header { + __u8 info_type; + __u8 pad; + __u16 len; +}; + +/* Unique file identifier info record */ +struct fanotify_event_info_fid { + struct fanotify_event_info_header hdr; + __kernel_fsid_t fsid; + /* + * Following is an opaque struct file_handle that can be passed as + * an argument to open_by_handle_at(2). + */ + unsigned char handle[0]; +}; + struct fanotify_response { __s32 fd; __u32 response;