Commit b9a74cde authored by Ross Lagerwall's avatar Ross Lagerwall Committed by Steve French
Browse files

cifs: Fix potential OOB access of lock element array 



If maxBuf is small but non-zero, it could result in a zero sized lock
element array which we would then try and access OOB.

Signed-off-by: default avatarRoss Lagerwall <ross.lagerwall@citrix.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
CC: Stable <stable@vger.kernel.org>
parent 92a8109e

fs/cifs/file.c

+4 −4
Original line number Diff line number Diff line
@@ -1132,10 +1132,10 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile) 


	/*

	 * Accessing maxBuf is racy with cifs_reconnect - need to store value

	 * and check it for zero before using.

	 * and check it before using.

	 */

	max_buf = tcon->ses->server->maxBuf;

	if (!max_buf) {

	if (max_buf < (sizeof(struct smb_hdr) + sizeof(LOCKING_ANDX_RANGE))) {

		free_xid(xid);

		return -EINVAL;

	}
@@ -1476,10 +1476,10 @@ cifs_unlock_range(struct cifsFileInfo *cfile, struct file_lock *flock, 


	/*

	 * Accessing maxBuf is racy with cifs_reconnect - need to store value

	 * and check it for zero before using.

	 * and check it before using.

	 */

	max_buf = tcon->ses->server->maxBuf;

	if (!max_buf)

	if (max_buf < (sizeof(struct smb_hdr) + sizeof(LOCKING_ANDX_RANGE)))

		return -EINVAL;



	BUILD_BUG_ON(sizeof(struct smb_hdr) + sizeof(LOCKING_ANDX_RANGE) >

fs/cifs/smb2file.c

+2 −2
Original line number Diff line number Diff line
@@ -122,10 +122,10 @@ smb2_unlock_range(struct cifsFileInfo *cfile, struct file_lock *flock, 


	/*

	 * Accessing maxBuf is racy with cifs_reconnect - need to store value

	 * and check it for zero before using.

	 * and check it before using.

	 */

	max_buf = tcon->ses->server->maxBuf;

	if (!max_buf)

	if (max_buf < sizeof(struct smb2_lock_element))

		return -EINVAL;



	BUILD_BUG_ON(sizeof(struct smb2_lock_element) > PAGE_SIZE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE