From: Luca Vizzarro <Luca.Vizzarro@arm.com>
To: linux-kernel@vger.kernel.org
Cc: Luca Vizzarro <Luca.Vizzarro@arm.com>, Jan Kara <jack@suse.cz>,
Amir Goldstein <amir73il@gmail.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
Jeff Layton <jlayton@kernel.org>,
Chuck Lever <chuck.lever@oracle.com>,
Kevin Brodsky <Kevin.Brodsky@arm.com>,
Vincenzo Frascino <Vincenzo.Frascino@arm.com>,
Szabolcs Nagy <Szabolcs.Nagy@arm.com>,
"Theodore Ts'o" <tytso@mit.edu>,
David Laight <David.Laight@ACULAB.com>,
Mark Rutland <Mark.Rutland@arm.com>,
linux-fsdevel@vger.kernel.org, linux-morello@op-lists.linaro.org
Subject: [PATCH v2 5/5] dnotify: Pass argument of fcntl_dirnotify as int
Date: Fri, 14 Apr 2023 16:24:59 +0100 [thread overview]
Message-ID: <20230414152459.816046-6-Luca.Vizzarro@arm.com> (raw)
In-Reply-To: <20230414152459.816046-1-Luca.Vizzarro@arm.com>
The interface for fcntl expects the argument passed for the command
F_DIRNOTIFY to be of type int. The current code wrongly treats it as
a long. In order to avoid access to undefined bits, we should explicitly
cast the argument to int.
Cc: Jan Kara <jack@suse.cz>
Cc: Amir Goldstein <amir73il@gmail.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Kevin Brodsky <Kevin.Brodsky@arm.com>
Cc: Vincenzo Frascino <Vincenzo.Frascino@arm.com>
Cc: Szabolcs Nagy <Szabolcs.Nagy@arm.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: David Laight <David.Laight@ACULAB.com>
Cc: Mark Rutland <Mark.Rutland@arm.com>
Cc: linux-fsdevel@vger.kernel.org
Cc: linux-morello@op-lists.linaro.org
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Luca Vizzarro <Luca.Vizzarro@arm.com>
---
fs/notify/dnotify/dnotify.c | 4 ++--
include/linux/dnotify.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index 190aa717fa32..ebdcc25df0f7 100644
--- a/fs/notify/dnotify/dnotify.c
+++ b/fs/notify/dnotify/dnotify.c
@@ -199,7 +199,7 @@ void dnotify_flush(struct file *filp, fl_owner_t id)
}
/* this conversion is done only at watch creation */
-static __u32 convert_arg(unsigned long arg)
+static __u32 convert_arg(unsigned int arg)
{
__u32 new_mask = FS_EVENT_ON_CHILD;
@@ -258,7 +258,7 @@ static int attach_dn(struct dnotify_struct *dn, struct dnotify_mark *dn_mark,
* up here. Allocate both a mark for fsnotify to add and a dnotify_struct to be
* attached to the fsnotify_mark.
*/
-int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
+int fcntl_dirnotify(int fd, struct file *filp, unsigned int arg)
{
struct dnotify_mark *new_dn_mark, *dn_mark;
struct fsnotify_mark *new_fsn_mark, *fsn_mark;
diff --git a/include/linux/dnotify.h b/include/linux/dnotify.h
index b1d26f9f1c9f..9f183a679277 100644
--- a/include/linux/dnotify.h
+++ b/include/linux/dnotify.h
@@ -30,7 +30,7 @@ struct dnotify_struct {
FS_MOVED_FROM | FS_MOVED_TO)
extern void dnotify_flush(struct file *, fl_owner_t);
-extern int fcntl_dirnotify(int, struct file *, unsigned long);
+extern int fcntl_dirnotify(int, struct file *, unsigned int);
#else
@@ -38,7 +38,7 @@ static inline void dnotify_flush(struct file *filp, fl_owner_t id)
{
}
-static inline int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
+static inline int fcntl_dirnotify(int fd, struct file *filp, unsigned int arg)
{
return -EINVAL;
}
--
2.34.1
next prev parent reply other threads:[~2023-04-14 15:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-14 15:24 [PATCH v2 0/5] Alter fcntl to handle int arguments correctly Luca Vizzarro
2023-04-14 15:24 ` [PATCH v2 1/5] fcntl: Cast commands with int args explicitly Luca Vizzarro
2023-04-14 15:46 ` Al Viro
2023-04-17 9:38 ` Mark Rutland
2023-04-18 10:51 ` Luca Vizzarro
2023-04-14 15:24 ` [PATCH v2 2/5] fs: Pass argument to fcntl_setlease as int Luca Vizzarro
2023-04-14 15:24 ` [PATCH v2 3/5] pipe: Pass argument of pipe_fcntl " Luca Vizzarro
2023-04-14 15:24 ` [PATCH v2 4/5] memfd: Pass argument of memfd_fcntl " Luca Vizzarro
2023-04-14 15:24 ` Luca Vizzarro [this message]
2023-07-06 8:30 ` [PATCH v2 0/5] Alter fcntl to handle int arguments correctly Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230414152459.816046-6-Luca.Vizzarro@arm.com \
--to=luca.vizzarro@arm.com \
--cc=David.Laight@ACULAB.com \
--cc=Kevin.Brodsky@arm.com \
--cc=Mark.Rutland@arm.com \
--cc=Szabolcs.Nagy@arm.com \
--cc=Vincenzo.Frascino@arm.com \
--cc=amir73il@gmail.com \
--cc=brauner@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=jack@suse.cz \
--cc=jlayton@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-morello@op-lists.linaro.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).