Created attachment 6299 [details]
Problematic reply: volume lenth is 2 bytes longer due zero-char termination

Run smbtorture4 RAW-QFSINFO test on samba 3.5.x.
Received following error:

# smbtorture --option=torture:samba3=true //server/vol0 -U Admin%passwd RAW-QFSINFO
...
check for correct termination
Expected wire_length 8 but got 10 for 'vol0'
(292) incorrect string termination in volume/volume_name
error: QFSINFO [
Unknown error/failure
]

Reviewed problematic reply with wireshark (see attached screenshot): indeed, in 'QUERY_FS_INFO/Info volume' reply I see that volume name ('vol0' in example) is zero-terminated (while it should be non-terminated). So label length is 2 bytes longer than expected (null char, two bytes per character).

Also I've checked the same flow on Windows XP: the test passes, no zero-char terminator is used (see another attached screenshot - 'sys_vol' label has no zero terminator). So termination should be fixed.

Patch for this case is trivial:

--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2979,7 +2979,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAva
                                pdata, flags2,
                                pdata+l2_vol_szVolLabel, vname,
                                PTR_DIFF(end_data, pdata+l2_vol_szVolLabel),
-                               STR_NOALIGN|STR_TERMINATE);
+                               STR_NOALIGN);
                        SCVAL(pdata,l2_vol_cch,len);
                        data_len = l2_vol_szVolLabel + len;
                        DEBUG(5,("smbd_do_qfsinfo : time = %x, namelen = %d, name = %s\n",

Thanks.