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: rucsoftsec@gmail.com
Cc: Chien Yen <chien.yen@oracle.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 3 deletions

diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index 4e37c1cbe8b2..40084d843e9f 100644
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -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 @@ out:
         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