* [PATCH] get_fs_type: Validate fs type string argument
@ 2017-07-11 13:47 Chandan Rajendra
2017-07-11 14:04 ` [PATCH V2] " Chandan Rajendra
0 siblings, 1 reply; 3+ messages in thread
From: Chandan Rajendra @ 2017-07-11 13:47 UTC (permalink / raw)
To: linux-fsdevel; +Cc: Chandan Rajendra, viro, abdhalee, joe
On ppc64, When a non-nul terminated string is passed as an argument to
the mount(2) syscall, copy_mount_string() ends up allocating 64k (the
PAGE_SIZE on ppc64) worth of space for holding the string in kernel's
address space.
Later, in set_precision() (invoked indirectly by get_fs_type()), we end
up assigning 65535 as the value to 'struct printf_spec'->precision
member. This field has a width of 16 bits and hence a truncated version
of the original value ends up being assigned. This causes the
"WARN_ONCE(spec->precision != prec, "precision %d too large", prec)"
statement inside set_precision() to be executed.
This commit fixes the bug by validating the length of the "filesystem
type" argument passed to get_fs_type() function.
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Suggested-by: Joe Perches <joe@perches.com>
---
fs/filesystems.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/filesystems.c b/fs/filesystems.c
index a920ad2..8e309d3 100644
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -275,6 +275,9 @@ struct file_system_type *get_fs_type(const char *name)
const char *dot = strchr(name, '.');
int len = dot ? dot - name : strlen(name);
+ if (len >= PATH_MAX)
+ return NULL;
+
fs = __get_fs_type(name, len);
if (!fs && (request_module("fs-%.*s", len, name) == 0)) {
fs = __get_fs_type(name, len);
--
2.9.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH V2] get_fs_type: Validate fs type string argument
2017-07-11 13:47 [PATCH] get_fs_type: Validate fs type string argument Chandan Rajendra
@ 2017-07-11 14:04 ` Chandan Rajendra
2017-07-24 15:17 ` Chandan Rajendra
0 siblings, 1 reply; 3+ messages in thread
From: Chandan Rajendra @ 2017-07-11 14:04 UTC (permalink / raw)
To: linux-fsdevel; +Cc: Chandan Rajendra, viro, abdhalee, joe
On ppc64, When a non-nul terminated string is passed as an argument to
the mount(2) syscall, copy_mount_string() ends up allocating 64k (the
PAGE_SIZE on ppc64) worth of space for holding the string in kernel's
address space.
Later, in set_precision() (invoked indirectly by get_fs_type()), we end
up assigning 65535 as the value to 'struct printf_spec'->precision
member. This field has a width of 16 bits and also it is signed data
type. Hence an invalid value ends up getting assigned. This causes the
"WARN_ONCE(spec->precision != prec, "precision %d too large", prec)"
statement inside set_precision() to be executed.
This commit fixes the bug by validating the length of the "filesystem
type" argument passed to get_fs_type() function.
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Suggested-by: Joe Perches <joe@perches.com>
---
Changelog:
v1->v2: Fix commit message.
fs/filesystems.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/filesystems.c b/fs/filesystems.c
index a920ad2..8e309d3 100644
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -275,6 +275,9 @@ struct file_system_type *get_fs_type(const char *name)
const char *dot = strchr(name, '.');
int len = dot ? dot - name : strlen(name);
+ if (len >= PATH_MAX)
+ return NULL;
+
fs = __get_fs_type(name, len);
if (!fs && (request_module("fs-%.*s", len, name) == 0)) {
fs = __get_fs_type(name, len);
--
2.9.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V2] get_fs_type: Validate fs type string argument
2017-07-11 14:04 ` [PATCH V2] " Chandan Rajendra
@ 2017-07-24 15:17 ` Chandan Rajendra
0 siblings, 0 replies; 3+ messages in thread
From: Chandan Rajendra @ 2017-07-24 15:17 UTC (permalink / raw)
To: viro; +Cc: linux-fsdevel, abdhalee, joe
On Tuesday, July 11, 2017 7:34:21 PM IST Chandan Rajendra wrote:
> On ppc64, When a non-nul terminated string is passed as an argument to
> the mount(2) syscall, copy_mount_string() ends up allocating 64k (the
> PAGE_SIZE on ppc64) worth of space for holding the string in kernel's
> address space.
>
> Later, in set_precision() (invoked indirectly by get_fs_type()), we end
> up assigning 65535 as the value to 'struct printf_spec'->precision
> member. This field has a width of 16 bits and also it is signed data
> type. Hence an invalid value ends up getting assigned. This causes the
> "WARN_ONCE(spec->precision != prec, "precision %d too large", prec)"
> statement inside set_precision() to be executed.
>
> This commit fixes the bug by validating the length of the "filesystem
> type" argument passed to get_fs_type() function.
>
> Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
> Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
> Suggested-by: Joe Perches <joe@perches.com>
> ---
> Changelog:
> v1->v2: Fix commit message.
>
> fs/filesystems.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/fs/filesystems.c b/fs/filesystems.c
> index a920ad2..8e309d3 100644
> --- a/fs/filesystems.c
> +++ b/fs/filesystems.c
> @@ -275,6 +275,9 @@ struct file_system_type *get_fs_type(const char *name)
> const char *dot = strchr(name, '.');
> int len = dot ? dot - name : strlen(name);
>
> + if (len >= PATH_MAX)
> + return NULL;
> +
> fs = __get_fs_type(name, len);
> if (!fs && (request_module("fs-%.*s", len, name) == 0)) {
> fs = __get_fs_type(name, len);
>
Hi Al Viro,
Can you please let me know if you have any review comments about this patch.
--
chandan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-24 15:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-11 13:47 [PATCH] get_fs_type: Validate fs type string argument Chandan Rajendra
2017-07-11 14:04 ` [PATCH V2] " Chandan Rajendra
2017-07-24 15:17 ` Chandan Rajendra
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.