mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
This commit is contained in:
commit
a0ce093180
350 changed files with 3949 additions and 1320 deletions
|
|
@ -525,6 +525,9 @@ int rds_rdma_extra_size(struct rds_rdma_args *args)
|
|||
|
||||
local_vec = (struct rds_iovec __user *)(unsigned long) args->local_vec_addr;
|
||||
|
||||
if (args->nr_local == 0)
|
||||
return -EINVAL;
|
||||
|
||||
/* figure out the number of pages in the vector */
|
||||
for (i = 0; i < args->nr_local; i++) {
|
||||
if (copy_from_user(&vec, &local_vec[i],
|
||||
|
|
@ -874,6 +877,7 @@ int rds_cmsg_atomic(struct rds_sock *rs, struct rds_message *rm,
|
|||
err:
|
||||
if (page)
|
||||
put_page(page);
|
||||
rm->atomic.op_active = 0;
|
||||
kfree(rm->atomic.op_notifier);
|
||||
|
||||
return ret;
|
||||
|
|
|
|||
Loading…
Reference in a new issue