2018-03-11 21:11:15

by Salvatore Mesoraca

Subject: [PATCH 1/2] 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 <[email protected]>
---
net/rds/connection.c | 2 +-
net/rds/ib.c | 3 +++
net/rds/rds.h | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/rds/connection.c b/net/rds/connection.c
index 2da3176..f80792c 100644
--- 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
--- 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 7301b9b..91ea08f 100644
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -709,6 +709,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)
--
1.9.1

2018-03-11 21:11:19

by Salvatore Mesoraca

Subject: [PATCH 2/2] net: rds: drop VLA in rds_walk_conn_path_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 <[email protected]>
---
net/rds/connection.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/rds/connection.c b/net/rds/connection.c
index f80792c..abef75d 100644
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -578,9 +578,9 @@ static void rds_walk_conn_path_info(struct socket *sock, unsigned int len,
struct rds_info_iterator *iter,
struct rds_info_lengths *lens,
int (*visitor)(struct rds_conn_path *, void *),
+ u64 *buffer,
size_t item_len)
{
- u64 buffer[(item_len + 7) / 8];
struct hlist_head *head;
struct rds_connection *conn;
size_t i;
@@ -649,8 +649,11 @@ static void rds_conn_info(struct socket *sock, unsigned int len,
struct rds_info_iterator *iter,
struct rds_info_lengths *lens)
{
+ u64 buffer[(sizeof(struct rds_info_connection) + 7) / 8];
+
rds_walk_conn_path_info(sock, len, iter, lens,
rds_conn_info_visitor,
+ buffer,
sizeof(struct rds_info_connection));
}

--
1.9.1

2018-03-12 07:08:12

by Santosh Shilimkar

Subject: Re: [PATCH 2/2] net: rds: drop VLA in rds_walk_conn_path_info()

On 3/11/18 2:07 PM, Salvatore Mesoraca wrote:
> 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 <[email protected]>
> ---
Acked-by: Santosh Shilimkar <[email protected]>

2018-03-12 07:08:14

by Santosh Shilimkar

Subject: Re: [PATCH 1/2] net: rds: drop VLA in rds_for_each_conn_info()

On 3/11/18 2:07 PM, Salvatore Mesoraca wrote:
> 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 <[email protected]>
> ---
Thanks for both VLA fixes Salvatore.

FWIW, Acked-by: Santosh Shilimkar <[email protected]>

2018-03-12 10:14:48

by Salvatore Mesoraca

Subject: Re: [PATCH 1/2] net: rds: drop VLA in rds_for_each_conn_info()

2018-03-12 8:06 GMT+01:00 [email protected]
<[email protected]>:
> On 3/11/18 2:07 PM, Salvatore Mesoraca wrote:
>>
>> 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 <[email protected]>
>> ---
>
> Thanks for both VLA fixes Salvatore.
>
> FWIW, Acked-by: Santosh Shilimkar <[email protected]>

Thank you very much for your time,

Salvatore

2018-03-12 19:09:52

by David Miller

Subject: Re: [PATCH 1/2] net: rds: drop VLA in rds_for_each_conn_info()

From: Salvatore Mesoraca <[email protected]>
Date: Sun, 11 Mar 2018 22:07:49 +0100

> 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 <[email protected]>

Applied.

2018-03-12 19:09:57

by David Miller

Subject: Re: [PATCH 2/2] net: rds: drop VLA in rds_walk_conn_path_info()

From: Salvatore Mesoraca <[email protected]>
Date: Sun, 11 Mar 2018 22:07:50 +0100

> 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 <[email protected]>

Also applied, thanks.