diff options
Diffstat (limited to 'arch/um/kernel')
-rw-r--r-- | arch/um/kernel/exitcode.c | 4 | ||||
-rw-r--r-- | arch/um/kernel/mem.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c index 829df49dee99..41ebbfebb333 100644 --- a/arch/um/kernel/exitcode.c +++ b/arch/um/kernel/exitcode.c | |||
@@ -40,9 +40,11 @@ static ssize_t exitcode_proc_write(struct file *file, | |||
40 | const char __user *buffer, size_t count, loff_t *pos) | 40 | const char __user *buffer, size_t count, loff_t *pos) |
41 | { | 41 | { |
42 | char *end, buf[sizeof("nnnnn\0")]; | 42 | char *end, buf[sizeof("nnnnn\0")]; |
43 | size_t size; | ||
43 | int tmp; | 44 | int tmp; |
44 | 45 | ||
45 | if (copy_from_user(buf, buffer, count)) | 46 | size = min(count, sizeof(buf)); |
47 | if (copy_from_user(buf, buffer, size)) | ||
46 | return -EFAULT; | 48 | return -EFAULT; |
47 | 49 | ||
48 | tmp = simple_strtol(buf, &end, 0); | 50 | tmp = simple_strtol(buf, &end, 0); |
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 7ddb64baf327..8636e905426f 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
@@ -279,8 +279,12 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) | |||
279 | struct page *pte; | 279 | struct page *pte; |
280 | 280 | ||
281 | pte = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO); | 281 | pte = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO); |
282 | if (pte) | 282 | if (!pte) |
283 | pgtable_page_ctor(pte); | 283 | return NULL; |
284 | if (!pgtable_page_ctor(pte)) { | ||
285 | __free_page(pte); | ||
286 | return NULL; | ||
287 | } | ||
284 | return pte; | 288 | return pte; |
285 | } | 289 | } |
286 | 290 | ||