X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mm%2Fmadvise.c;h=03dfa5c7adb3c41acdf672b6504516073866c996;hb=a1c2d60889d633ffecfa9f1f7ac0bdb474b7484e;hp=14d260fa0d17939a2279c244df91789cd30720e4;hpb=25e4b485fb8eeda8aa7a2e1e45fbb31538565117;p=~andy%2Flinux

diff --git a/mm/madvise.c b/mm/madvise.c
index 14d260fa0d1..03dfa5c7adb 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -69,10 +69,14 @@ static long madvise_behavior(struct vm_area_struct * vma,
 		new_flags &= ~VM_DONTCOPY;
 		break;
 	case MADV_DONTDUMP:
-		new_flags |= VM_NODUMP;
+		new_flags |= VM_DONTDUMP;
 		break;
 	case MADV_DODUMP:
-		new_flags &= ~VM_NODUMP;
+		if (new_flags & VM_SPECIAL) {
+			error = -EINVAL;
+			goto out;
+		}
+		new_flags &= ~VM_DONTDUMP;
 		break;
 	case MADV_MERGEABLE:
 	case MADV_UNMERGEABLE: