Skip to contentSkip to conversation

nbd/server: Use smarter assert

PATCH Superseded Eric Blake 2 participants 3 messages Oct 17, 2022

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Eric Blake

author
#0 lore raw

PATCH 1/1 nbd/server: Use smarter assert

Assigning strlen() to a uint32_t and then asserting that it isn't too large doesn't catch the case of an input string 4G in length. Thankfully, the incoming string can never be that large: if the export name is reflecting what the client asked about, we already guarantee that we drop the NBD connection if the client tries to send more than 32M in a single NBD_OPT_* request; and if the export name is coming from qemu, nbd_receive_negotiate() asserted that strlen(info->name) <= NBD_MAX_STRING_SIZE. Still, it doesn't hurt to be more explicit in how we write our assertion that we are aware that no wraparound is possible.

Fixes 93676c88 ("nbd: Don't send oversize strings", v4.2.0)
---
 nbd/client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
nbd/client.c +1 -1
index 60c9f4941a..b601ee97e5 100644
@@ -658,7 +658,7 @@ static int nbd_send_meta_query(QIOChannel *ioc, uint32_t opt,
     char *p;
 
     data_len = sizeof(export_len) + export_len + sizeof(queries);
-    assert(export_len <= NBD_MAX_STRING_SIZE);
+    assert(strlen(export) <= NBD_MAX_STRING_SIZE);
     if (query) {
         query_len = strlen(query);
         data_len += sizeof(query_len) + query_len;
Signature · 1 line
2.37.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · * Eric Blake ([email protected]) wrote:

Assigning strlen() to a uint32_t and then asserting that it isn't too large doesn't catch the case of an input string 4G in length. Thankfully, the incoming string can never be that large: if the export name is reflecting what the client asked about, we already guarantee that we drop the NBD connection if the client tries to send more than 32M in a single NBD_OPT_* request; and if the export name is coming from qemu, nbd_receive_negotiate() asserted that strlen(info->name) <= NBD_MAX_STRING_SIZE. Still, it doesn't hurt to be more explicit in how we write our assertion that we are aware that no wraparound is possible.

Quoted 3 lines
Fixes 93676c88 ("nbd: Don't send oversize strings", v4.2.0)
Quoted 20 lines
---
 nbd/client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
nbd/client.c +1 -1
index 60c9f4941a..b601ee97e5 100644
@@ -658,7 +658,7 @@ static int nbd_send_meta_query(QIOChannel *ioc, uint32_t opt,
     char *p;
 
     data_len = sizeof(export_len) + export_len + sizeof(queries);
-    assert(export_len <= NBD_MAX_STRING_SIZE);
+    assert(strlen(export) <= NBD_MAX_STRING_SIZE);
     if (query) {
         query_len = strlen(query);
         data_len += sizeof(query_len) + query_len;
Signature · 1 line
2.37.3
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
author
#2 lore raw
In reply to Eric Blake

Given the file touched by this patch[1],

The subject should use 'nbd/client:'

Quoted 4 lines · Eric Blake

Assigning strlen() to a uint32_t and then asserting that it isn't too large doesn't catch the case of an input string 4G in length. Thankfully, the incoming string can never be that large: if the export name is reflecting what the client asked about, we already guarantee

and this should be 'is reflecting a name provided by the server'...

Quoted 2 lines

that we drop the NBD connection if the client tries to send more than 32M in a single NBD_OPT_* request; and if the export name is coming

...'if the server tries to send more than 32M in a reply to a single NBD_OPT_* request from the client'

Quoted 10 lines

from qemu, nbd_receive_negotiate() asserted that strlen(info->name) <= NBD_MAX_STRING_SIZE. Still, it doesn't hurt to be more explicit in how we write our assertion that we are aware that no wraparound is possible.

Fixes 93676c88 ("nbd: Don't send oversize strings", v4.2.0)
---
 nbd/client.c | 2 +-

[1] this patch is to the client, not the server.

Quoted 7 lines
 1 file changed, 1 insertion(+), 1 deletion(-)
nbd/client.c +0 -0
index 60c9f4941a..b601ee97e5 100644

nbd/client.c static int nbd_send_meta_query(QIOChannel *ioc, uint32_t opt, · line 664

Quoted 8 lines
nbd/client.c +1 -1
@@ -658,7 +658,7 @@ static int nbd_send_meta_query(QIOChannel *ioc, uint32_t opt,
     char *p;
 
     data_len = sizeof(export_len) + export_len + sizeof(queries);
-    assert(export_len <= NBD_MAX_STRING_SIZE);
+    assert(strlen(export) <= NBD_MAX_STRING_SIZE);
     if (query) {
         query_len = strlen(query);
         data_len += sizeof(query_len) + query_len;
           assert(query_len <= NBD_MAX_STRING_SIZE);

and this assertion on query_len could use the same treatment (similar analysis as to why callers are never passing in a 4G string, but it doesn't hurt to be explicit in the assertion). v2 coming up.

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org