mm: madvise correct return code
Subsystems (2)
PATCH 1/1 mm: madvise correct return code
This is a pretty obscure case, but it doesn't hurt to follow standards if they're there. I can't imagine any real program relying on a 0 range madvise call with invalid behaviour *not* failing... We have this in SLES11 FWIW, and no problems reported.
--
mm: madvise correct return code
The posix_madvise() function succeeds (and does nothing) when called with parameters (NULL, 0, -1); according to LSB tests, it should fail with EINVAL because -1 is not a valid flag.
When called with a valid address and size, it correctly fails.
So perform an initial check for valid flags first.
--- mm/madvise.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
mm/madvise.c +22 -1
@@ -247,12 +247,30 @@ madvise_vma(struct vm_area_struct *vma,break ;default : - error = -EINVAL ; +BUG ();break ; }return error; } +static int +madvise_behavior_valid (int behavior) +{ +switch (behavior) { +case MADV_DOFORK : +case MADV_DONTFORK : +case MADV_NORMAL : +case MADV_SEQUENTIAL : +case MADV_RANDOM : +case MADV_REMOVE : +case MADV_WILLNEED : +case MADV_DONTNEED : +return 1 ; + +default : +return 0 ; + } +}/* * The madvise(2) system call. *
@@ -298,6 +316,9 @@ SYSCALL_DEFINE3(madvise, unsigned long,int write;size_t len; +if (!madvise_behavior_valid (behavior)) +return error; + write =madvise_need_mmap_write (behavior);if (write)down_write (¤t->mm->mmap_sem);
Quoted 5 lines · Nick Piggin
This is a pretty obscure case, but it doesn't hurt to follow standards if they're there. I can't imagine any real program relying on a 0 range madvise call with invalid behaviour *not* failing... We have this in SLES11 FWIW, and no problems reported.
--
But it was not consistent with the man page... we should fix it.
Quoted 7 lines
mm: madvise correct return code
The
posix_madvise()function succeeds (and does nothing) when called with parameters (NULL, 0, -1); according to LSB tests, it should fail with EINVAL because -1 is not a valid flag.
Quoted 6 lines
When called with a valid address and size, it correctly fails.
So perform an initial check for valid flags first.
Reported-by Jiri Dluhos <[email protected]>Signed-off-by Nick Piggin <[email protected]>