From: Luca Vizzarro <Luca.Vizzarro@arm.com>
To: linux-kernel@vger.kernel.org
Cc: Luca Vizzarro <Luca.Vizzarro@arm.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 3/5] pipe: Pass argument of pipe_fcntl as int
Date: Fri, 14 Apr 2023 16:24:57 +0100 [thread overview]
Message-ID: <20230414152459.816046-4-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_SETPIPE_SZ 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: 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
Signed-off-by: Luca Vizzarro <Luca.Vizzarro@arm.com>
---
fs/pipe.c | 6 +++---
include/linux/pipe_fs_i.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/pipe.c b/fs/pipe.c
index 42c7ff41c2db..5b718342105f 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -1231,7 +1231,7 @@ const struct file_operations pipefifo_fops = {
* Currently we rely on the pipe array holding a power-of-2 number
* of pages. Returns 0 on error.
*/
-unsigned int round_pipe_size(unsigned long size)
+unsigned int round_pipe_size(unsigned int size)
{
if (size > (1U << 31))
return 0;
@@ -1314,7 +1314,7 @@ int pipe_resize_ring(struct pipe_inode_info *pipe, unsigned int nr_slots)
* Allocate a new array of pipe buffers and copy the info over. Returns the
* pipe size if successful, or return -ERROR on error.
*/
-static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long arg)
+static long pipe_set_size(struct pipe_inode_info *pipe, unsigned int arg)
{
unsigned long user_bufs;
unsigned int nr_slots, size;
@@ -1382,7 +1382,7 @@ struct pipe_inode_info *get_pipe_info(struct file *file, bool for_splice)
return pipe;
}
-long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
+long pipe_fcntl(struct file *file, unsigned int cmd, unsigned int arg)
{
struct pipe_inode_info *pipe;
long ret;
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index d2c3f16cf6b1..033d77f0c568 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -273,10 +273,10 @@ bool pipe_is_unprivileged_user(void);
#ifdef CONFIG_WATCH_QUEUE
int pipe_resize_ring(struct pipe_inode_info *pipe, unsigned int nr_slots);
#endif
-long pipe_fcntl(struct file *, unsigned int, unsigned long arg);
+long pipe_fcntl(struct file *, unsigned int, unsigned int arg);
struct pipe_inode_info *get_pipe_info(struct file *file, bool for_splice);
int create_pipe_files(struct file **, int);
-unsigned int round_pipe_size(unsigned long size);
+unsigned int round_pipe_size(unsigned int size);
#endif
--
2.34.1
next prev parent reply other threads:[~2023-04-14 15:26 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 ` Luca Vizzarro [this message]
2023-04-14 15:24 ` [PATCH v2 4/5] memfd: Pass argument of memfd_fcntl " Luca Vizzarro
2023-04-14 15:24 ` [PATCH v2 5/5] dnotify: Pass argument of fcntl_dirnotify " Luca Vizzarro
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-4-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=brauner@kernel.org \
--cc=chuck.lever@oracle.com \
--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).