net: rds: drop VLA in rds_for_each_conn_info()

Avoid VLA[1] by using an already allocated buffer passed
by the caller.

[1] https://lkml.org/lkml/2018/3/7/621

Signed-off-by: Salvatore Mesoraca <s.mesoraca16@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/rds/connection.c b/net/rds/connection.c
index 2da3176..f80792c 100644 (file)
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -540,9 +540,9 @@ void rds_for_each_conn_info(struct socket *sock, unsigned int len,
                          struct rds_info_iterator *iter,
                          struct rds_info_lengths *lens,
                          int (*visitor)(struct rds_connection *, void *),
+                         u64 *buffer,
                          size_t item_len)
 {
-       uint64_t buffer[(item_len + 7) / 8];
        struct hlist_head *head;
        struct rds_connection *conn;
        size_t i;

diff --git a/net/rds/ib.c b/net/rds/ib.c
index 50a88f3..02deee2 100644 (file)
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -321,8 +321,11 @@ static void rds_ib_ic_info(struct socket *sock, unsigned int len,
                           struct rds_info_iterator *iter,
                           struct rds_info_lengths *lens)
 {
+       u64 buffer[(sizeof(struct rds_info_rdma_connection) + 7) / 8];
+
        rds_for_each_conn_info(sock, len, iter, lens,
                                rds_ib_conn_info_visitor,
+                               buffer,
                                sizeof(struct rds_info_rdma_connection));
 }
 

diff --git a/net/rds/rds.h b/net/rds/rds.h
index 74cd27c..b04c333 100644 (file)
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -735,6 +735,7 @@ void rds_for_each_conn_info(struct socket *sock, unsigned int len,
                          struct rds_info_iterator *iter,
                          struct rds_info_lengths *lens,
                          int (*visitor)(struct rds_connection *, void *),
+                         u64 *buffer,
                          size_t item_len);
 
 __printf(2, 3)