Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dee49f20 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

rds: avoid calling sock_kfree_s() on allocation failure 



It is okay to free a NULL pointer but not okay to mischarge the socket optmem
accounting. Compile test only.

Reported-by: default avatar <rucsoftsec@gmail.com>
Cc: Chien Yen <chien.yen@oracle.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarCong Wang <cwang@twopensource.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22c0b963

net/rds/rdma.c

+4 −3
Original line number Diff line number Diff line
@@ -564,12 +564,12 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm, 


	if (rs->rs_bound_addr == 0) {

		ret = -ENOTCONN; /* XXX not a great errno */

		goto out;

		goto out_ret;

	}



	if (args->nr_local > UIO_MAXIOV) {

		ret = -EMSGSIZE;

		goto out;

		goto out_ret;

	}



	/* Check whether to allocate the iovec area */
@@ -578,7 +578,7 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm, 
		iovs = sock_kmalloc(rds_rs_to_sk(rs), iov_size, GFP_KERNEL);

		if (!iovs) {

			ret = -ENOMEM;

			goto out;

			goto out_ret;

		}

	}
@@ -696,6 +696,7 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm, 
	if (iovs != iovstack)

		sock_kfree_s(rds_rs_to_sk(rs), iovs, iov_size);

	kfree(pages);

out_ret:

	if (ret)

		rds_rdma_free_op(op);

	else