From: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
Date: Wed, 10 Jul 2013 13:52:06 +0000 (+0200)
Subject: s3:smbd: allow info class SMB_QUERY_FS_VOLUME_INFO to return partial data
X-Git-Tag: samba-3.6.19~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ad9d25a37d747e38d99bcc2dacefc1cbe4b9045;p=thirdparty%2Fsamba.git

s3:smbd: allow info class SMB_QUERY_FS_VOLUME_INFO to return partial data

Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
(cherry picked from commit ec46f6b91941e38dd92f8e0fb0f278592e3157b6)
(cherry picked from commit 84eabf7b012fba624e900f2cc0294f2f1c598a46)
---

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 20d42f7ea25..575f96e816d 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3144,6 +3144,13 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_ex_dev, (u
 
 			DEBUG(5,("smbd_do_qfsinfo : SMB_QUERY_FS_VOLUME_INFO namelen = %d, vol=%s serv=%s\n",
 				(int)strlen(vname),vname, lp_servicename(snum)));
+			if (max_data_bytes >= 24 && data_len > max_data_bytes) {
+				/* the client only requested a portion of the
+				   volume label */
+				data_len = max_data_bytes;
+				status = STATUS_BUFFER_OVERFLOW;
+			}
+
 			break;
 
 		case SMB_QUERY_FS_SIZE_INFO: