Commit 5a519bea authored by Steve French's avatar Steve French
Browse files

cifs: protect against server returning invalid file system block size 



For a network file system we generally prefer large i/o, but
if the server returns invalid file system block/sector sizes
in cifs (vers=1.0) QFSInfo then set block size to a default
of a reasonable minimum (4K).

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Reviewed-by: default avatarAurelien Aptel <aaptel@suse.com>
parent 2c887635

fs/cifs/cifssmb.c

+21 −0
Original line number Diff line number Diff line
@@ -5027,6 +5027,13 @@ oldQFSInfoRetry: 
				le16_to_cpu(response_data->BytesPerSector) *

				le32_to_cpu(response_data->

					SectorsPerAllocationUnit);

			/*

			 * much prefer larger but if server doesn't report

			 * a valid size than 4K is a reasonable minimum

			 */

			if (FSData->f_bsize < 512)

				FSData->f_bsize = 4096;



			FSData->f_blocks =

			       le32_to_cpu(response_data->TotalAllocationUnits);

			FSData->f_bfree = FSData->f_bavail =
@@ -5107,6 +5114,13 @@ QFSInfoRetry: 
			    le32_to_cpu(response_data->BytesPerSector) *

			    le32_to_cpu(response_data->

					SectorsPerAllocationUnit);

			/*

			 * much prefer larger but if server doesn't report

			 * a valid size than 4K is a reasonable minimum

			 */

			if (FSData->f_bsize < 512)

				FSData->f_bsize = 4096;



			FSData->f_blocks =

			    le64_to_cpu(response_data->TotalAllocationUnits);

			FSData->f_bfree = FSData->f_bavail =
@@ -5470,6 +5484,13 @@ QFSPosixRetry: 
				 data_offset);

			FSData->f_bsize =

					le32_to_cpu(response_data->BlockSize);

			/*

			 * much prefer larger but if server doesn't report

			 * a valid size than 4K is a reasonable minimum

			 */

			if (FSData->f_bsize < 512)

				FSData->f_bsize = 4096;



			FSData->f_blocks =

					le64_to_cpu(response_data->TotalBlocks);

			FSData->f_bfree =

CRA Git | Maintained and supported by SUSTech CRA and CCSE