[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1520830808-26991-1-git-send-email-me@tobin.cc>
Date: Mon, 12 Mar 2018 16:00:08 +1100
From: "Tobin C. Harding" <me@...in.cc>
To: Ilya Dryomov <idryomov@...il.com>,
Sage Weil <sage@...hat.com>,
Alex Elder <elder@...nel.org>
Cc: "Tobin C. Harding" <me@...in.cc>,
ceph-devel@...r.kernel.org,
linux-kernel@...r.kernel.org,
kernel-hardening@...ts.openwall.com,
Tycho Andersen <tycho@...ho.ws>,
Kees Cook <keescook@...omium.org>
Subject: [PATCH] rbd: Remove VLA saving ack buffer size
The kernel would like to have all stack VLA usage removed[1]. Here the
array is declared using a variable that is declared using a constant
statement but the compiler still emits a warning. We can clear the
warning bu using the constant statement directly. The buffer size
variable is set to zero on the error path; the buffer size variable is
used later in the function, we can maintain this behavior by setting the
variable using the macro ARRAY_SIZE.
Use constant statement to declare array.
[1]: https://lkml.org/lkml/2018/3/7/621
Signed-off-by: Tobin C. Harding <me@...in.cc>
---
Excuse the lack of threading, I forgot the second patch ;) Can re-send
threaded correctly if required.
drivers/block/rbd.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 927ecd9a2511..7c228753fddd 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3618,13 +3618,14 @@ static void __rbd_acknowledge_notify(struct rbd_device *rbd_dev,
u64 notify_id, u64 cookie, s32 *result)
{
struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc;
- int buf_size = 4 + CEPH_ENCODING_START_BLK_LEN;
- char buf[buf_size];
+ char buf[4 + CEPH_ENCODING_START_BLK_LEN];
+ int buf_size;
int ret;
if (result) {
void *p = buf;
+ buf_size = ARRAY_SIZE(buf);
/* encode ResponseMessage */
ceph_start_encoding(&p, 1, 1,
buf_size - CEPH_ENCODING_START_BLK_LEN);
--
2.7.4
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
