* + mm-madvise-move-up-the-behavior-parameter-validation.patch added to -mm tree
@ 2017-04-18 22:00 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2017-04-18 22:00 UTC (permalink / raw)
To: khandual, n-horiguchi, rientjes, mm-commits
The patch titled
Subject: mm/madvise: move up the behavior parameter validation
has been added to the -mm tree. Its filename is
mm-madvise-move-up-the-behavior-parameter-validation.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-madvise-move-up-the-behavior-parameter-validation.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-madvise-move-up-the-behavior-parameter-validation.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Subject: mm/madvise: move up the behavior parameter validation
madvise_behavior_valid() should be called before acting upon the behavior
parameter. Hence move up the function. This also includes
MADV_SOFT_OFFLINE and MADV_HWPOISON options as valid behavior parameter
for the system call madvise().
Link: http://lkml.kernel.org/r/20170418052844.24891-1-khandual@linux.vnet.ibm.com
Signed-off-by: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/madvise.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff -puN mm/madvise.c~mm-madvise-move-up-the-behavior-parameter-validation mm/madvise.c
--- a/mm/madvise.c~mm-madvise-move-up-the-behavior-parameter-validation
+++ a/mm/madvise.c
@@ -687,6 +687,10 @@ madvise_behavior_valid(int behavior)
#endif
case MADV_DONTDUMP:
case MADV_DODUMP:
+#ifdef CONFIG_MEMORY_FAILURE
+ case MADV_SOFT_OFFLINE:
+ case MADV_HWPOISON:
+#endif
return true;
default:
@@ -760,10 +764,6 @@ SYSCALL_DEFINE3(madvise, unsigned long,
size_t len;
struct blk_plug plug;
-#ifdef CONFIG_MEMORY_FAILURE
- if (behavior == MADV_HWPOISON || behavior == MADV_SOFT_OFFLINE)
- return madvise_inject_error(behavior, start, start + len_in);
-#endif
if (!madvise_behavior_valid(behavior))
return error;
@@ -783,6 +783,11 @@ SYSCALL_DEFINE3(madvise, unsigned long,
if (end == start)
return error;
+#ifdef CONFIG_MEMORY_FAILURE
+ if (behavior == MADV_HWPOISON || behavior == MADV_SOFT_OFFLINE)
+ return madvise_inject_error(behavior, start, start + len_in);
+#endif
+
write = madvise_need_mmap_write(behavior);
if (write) {
if (down_write_killable(¤t->mm->mmap_sem))
_
Patches currently in -mm which might be from khandual@linux.vnet.ibm.com are
mm-mmap-replace-shm_huge_mask-with-map_huge_mask-inside-mmap_pgoff.patch
mm-madvise-clean-up-madv_soft_offline-and-madv_hwpoison.patch
mm-madvise-move-up-the-behavior-parameter-validation.patch
mm-softoffline-add-page-flag-description-in-error-paths.patch
selftests-vm-add-a-test-for-virtual-address-range-mapping.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-04-18 22:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-18 22:00 + mm-madvise-move-up-the-behavior-parameter-validation.patch added to -mm tree akpm
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.