Commit 3498e7f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.16-rc2-ksmbd-fixes' of git://git.samba.org/ksmbd 

Pull ksmbd fixes from Steve French:
 "Five ksmbd server fixes, four of them for stable:

   - memleak fix

   - fix for default data stream on filesystems that don't support xattr

   - error logging fix

   - session setup fix

   - minor doc cleanup"

* tag '5.16-rc2-ksmbd-fixes' of git://git.samba.org/ksmbd:
  ksmbd: fix memleak in get_file_stream_info()
  ksmbd: contain default data stream even if xattr is empty
  ksmbd: downgrade addition info error msg to debug in smb2_get_info_sec()
  docs: filesystem: cifs: ksmbd: Fix small layout issues
  ksmbd: Fix an error handling path in 'smb2_sess_setup()'
parents 00169a92 178ca6f8

Documentation/filesystems/cifs/ksmbd.rst

+5 −5
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ Each layer 
2. Enable one of components (smb, auth, vfs, oplock, ipc, conn, rdma)

	# sudo ksmbd.control -d "smb"



3. Show what prints are enable.

3. Show what prints are enabled.

	# cat /sys/class/ksmbd-control/debug

	  [smb] auth vfs oplock ipc conn [rdma]

fs/ksmbd/smb2pdu.c

+17 −13
Original line number Diff line number Diff line
@@ -1697,8 +1697,10 @@ int smb2_sess_setup(struct ksmbd_work *work) 
	negblob_off = le16_to_cpu(req->SecurityBufferOffset);

	negblob_len = le16_to_cpu(req->SecurityBufferLength);

	if (negblob_off < offsetof(struct smb2_sess_setup_req, Buffer) ||

	    negblob_len < offsetof(struct negotiate_message, NegotiateFlags))

		return -EINVAL;

	    negblob_len < offsetof(struct negotiate_message, NegotiateFlags)) {

		rc = -EINVAL;

		goto out_err;

	}



	negblob = (struct negotiate_message *)((char *)&req->hdr.ProtocolId +

			negblob_off);
@@ -4457,6 +4459,12 @@ static void get_file_stream_info(struct ksmbd_work *work, 
			 &stat);

	file_info = (struct smb2_file_stream_info *)rsp->Buffer;



	buf_free_len =

		smb2_calc_max_out_buf_len(work, 8,

					  le32_to_cpu(req->OutputBufferLength));

	if (buf_free_len < 0)

		goto out;



	xattr_list_len = ksmbd_vfs_listxattr(path->dentry, &xattr_list);

	if (xattr_list_len < 0) {

		goto out;
@@ -4465,12 +4473,6 @@ static void get_file_stream_info(struct ksmbd_work *work, 
		goto out;

	}



	buf_free_len =

		smb2_calc_max_out_buf_len(work, 8,

					  le32_to_cpu(req->OutputBufferLength));

	if (buf_free_len < 0)

		goto out;



	while (idx < xattr_list_len) {

		stream_name = xattr_list + idx;

		streamlen = strlen(stream_name);
@@ -4496,8 +4498,10 @@ static void get_file_stream_info(struct ksmbd_work *work, 
				     ":%s", &stream_name[XATTR_NAME_STREAM_LEN]);



		next = sizeof(struct smb2_file_stream_info) + streamlen * 2;

		if (next > buf_free_len)

		if (next > buf_free_len) {

			kfree(stream_buf);

			break;

		}



		file_info = (struct smb2_file_stream_info *)&rsp->Buffer[nbytes];

		streamlen  = smbConvertToUTF16((__le16 *)file_info->StreamName,
@@ -4514,6 +4518,7 @@ static void get_file_stream_info(struct ksmbd_work *work, 
		file_info->NextEntryOffset = cpu_to_le32(next);

	}



out:

	if (!S_ISDIR(stat.mode) &&

	    buf_free_len >= sizeof(struct smb2_file_stream_info) + 7 * 2) {

		file_info = (struct smb2_file_stream_info *)
@@ -4522,14 +4527,13 @@ static void get_file_stream_info(struct ksmbd_work *work, 
					      "::$DATA", 7, conn->local_nls, 0);

		streamlen *= 2;

		file_info->StreamNameLength = cpu_to_le32(streamlen);

		file_info->StreamSize = 0;

		file_info->StreamAllocationSize = 0;

		file_info->StreamSize = cpu_to_le64(stat.size);

		file_info->StreamAllocationSize = cpu_to_le64(stat.blocks << 9);

		nbytes += sizeof(struct smb2_file_stream_info) + streamlen;

	}



	/* last entry offset should be 0 */

	file_info->NextEntryOffset = 0;

out:

	kvfree(xattr_list);



	rsp->OutputBufferLength = cpu_to_le32(nbytes);
@@ -5068,7 +5072,7 @@ static int smb2_get_info_sec(struct ksmbd_work *work, 
	if (addition_info & ~(OWNER_SECINFO | GROUP_SECINFO | DACL_SECINFO |

			      PROTECTED_DACL_SECINFO |

			      UNPROTECTED_DACL_SECINFO)) {

		pr_err("Unsupported addition info: 0x%x)\n",

		ksmbd_debug(SMB, "Unsupported addition info: 0x%x)\n",

		       addition_info);



		pntsd->revision = cpu_to_le16(1);