Merge tag 'edac/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / fs / binfmt_misc.c

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 01a2cd9ab2bf74fae4ccb27214c26405089a1929..70789e198dea9249e1ad3388a25ba209769acb12 100644 (file)
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -308,7 +308,7 @@ static Node *create_entry(const char __user *buffer, size_t count)
 
        err = -ENOMEM;
        memsize = sizeof(Node) + count + 8;
-       e = kmalloc(memsize, GFP_USER);
+       e = kmalloc(memsize, GFP_KERNEL);
        if (!e)
                goto out;
 
@@ -416,7 +416,7 @@ static Node *create_entry(const char __user *buffer, size_t count)
 
                        if (e->mask) {
                                int i;
-                               char *masked = kmalloc(e->size, GFP_USER);
+                               char *masked = kmalloc(e->size, GFP_KERNEL);
 
                                print_hex_dump_bytes(
                                        KBUILD_MODNAME ": register:  mask[decoded]: ",