aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorDan Murphy2013-03-18 09:16:44 -0500
committerDan Murphy2013-03-18 09:16:44 -0500
commited93a28fb0b1dc28cc252ee87f6fce3e07bf23fe (patch)
tree70a65e9cab03e836233c187730c4e28851e8a6cd /mm
parent97935e38f983f32595edb78b5a4cc99727b36ac1 (diff)
parent1a45c310b2102c58e37f84abba67fe21d5d6edcf (diff)
downloadkernel-video-ed93a28fb0b1dc28cc252ee87f6fce3e07bf23fe.tar.gz
kernel-video-ed93a28fb0b1dc28cc252ee87f6fce3e07bf23fe.tar.xz
kernel-video-ed93a28fb0b1dc28cc252ee87f6fce3e07bf23fe.zip
Merge branch 'linux-3.8.y' into ti-linux-3.8.y
* linux-3.8.y: (103 commits) Linux 3.8.3 6lowpan: Remove __init tag from lowpan_netlink_fini(). userns: Don't allow CLONE_NEWUSER | CLONE_FS w1-gpio: fix section mismatch Revert "xen/blkback: Don't trust the handle from the frontend." USB: Fix connected device switch to Inactive state. USB: Rip out recursive call on warm port reset. USB: Prepare for refactoring by adding extra udev checks. USB: Don't use EHCI port sempahore for USB 3.0 hubs. efi: be more paranoid about available space when creating variables efivars: Disable external interrupt while holding efivars->lock ftrace: Update the kconfig for DYNAMIC_FTRACE powerpc: Apply early paca fixups to boot_paca and the boot cpu's paca ARM: kirkwood: of_serial: fix clock gating by removing clock-frequency ARM: mxs_defconfig: Make USB host functional again gpio: mvebu: Add clk support to prevent lockup rtc: rtc-mv: Add support for clk to avoid lockups vfs: fix pipe counter breakage Fix: compat_rw_copy_check_uvector() misuse in aio, readv, writev, and security keys keys: fix race with concurrent install_user_keyrings() ...
Diffstat (limited to 'mm')
-rw-r--r--mm/mempolicy.c2
-rw-r--r--mm/process_vm_access.c8
2 files changed, 1 insertions, 9 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index e2df1c1fb41..3df6d12e8ff 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2386,8 +2386,8 @@ restart:
2386 *mpol_new = *n->policy; 2386 *mpol_new = *n->policy;
2387 atomic_set(&mpol_new->refcnt, 1); 2387 atomic_set(&mpol_new->refcnt, 1);
2388 sp_node_init(n_new, n->end, end, mpol_new); 2388 sp_node_init(n_new, n->end, end, mpol_new);
2389 sp_insert(sp, n_new);
2390 n->end = start; 2389 n->end = start;
2390 sp_insert(sp, n_new);
2391 n_new = NULL; 2391 n_new = NULL;
2392 mpol_new = NULL; 2392 mpol_new = NULL;
2393 break; 2393 break;
diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
index 926b4664974..fd26d043350 100644
--- a/mm/process_vm_access.c
+++ b/mm/process_vm_access.c
@@ -429,12 +429,6 @@ compat_process_vm_rw(compat_pid_t pid,
429 if (flags != 0) 429 if (flags != 0)
430 return -EINVAL; 430 return -EINVAL;
431 431
432 if (!access_ok(VERIFY_READ, lvec, liovcnt * sizeof(*lvec)))
433 goto out;
434
435 if (!access_ok(VERIFY_READ, rvec, riovcnt * sizeof(*rvec)))
436 goto out;
437
438 if (vm_write) 432 if (vm_write)
439 rc = compat_rw_copy_check_uvector(WRITE, lvec, liovcnt, 433 rc = compat_rw_copy_check_uvector(WRITE, lvec, liovcnt,
440 UIO_FASTIOV, iovstack_l, 434 UIO_FASTIOV, iovstack_l,
@@ -459,8 +453,6 @@ free_iovecs:
459 kfree(iov_r); 453 kfree(iov_r);
460 if (iov_l != iovstack_l) 454 if (iov_l != iovstack_l)
461 kfree(iov_l); 455 kfree(iov_l);
462
463out:
464 return rc; 456 return rc;
465} 457}
466 458