Commit f3438b4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.14-rc3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "Three cifs/smb3 fixes, including two for stable, and a fix for an
  fallocate problem noticed by Clang"

* tag '5.14-rc3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: add missing parsing of backupuid
  smb3: rc uninitialized in one fallocate path
  SMB3: fix readpage for large swap cache
parents c7d10223 b946dbcf

fs/cifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -4619,7 +4619,7 @@ static int cifs_readpage_worker(struct file *file, struct page *page, 


static int cifs_readpage(struct file *file, struct page *page)

{

	loff_t offset = (loff_t)page->index << PAGE_SHIFT;

	loff_t offset = page_file_offset(page);

	int rc = -EACCES;

	unsigned int xid;

fs/cifs/fs_context.c

+7 −0
Original line number Diff line number Diff line
@@ -925,6 +925,13 @@ static int smb3_fs_context_parse_param(struct fs_context *fc, 
		ctx->cred_uid = uid;

		ctx->cruid_specified = true;

		break;

	case Opt_backupuid:

		uid = make_kuid(current_user_ns(), result.uint_32);

		if (!uid_valid(uid))

			goto cifs_parse_mount_err;

		ctx->backupuid = uid;

		ctx->backupuid_specified = true;

		break;

	case Opt_backupgid:

		gid = make_kgid(current_user_ns(), result.uint_32);

		if (!gid_valid(gid))

fs/cifs/smb2ops.c

+2 −1
Original line number Diff line number Diff line
@@ -3617,7 +3617,8 @@ static int smb3_simple_fallocate_write_range(unsigned int xid, 
					     char *buf)

{

	struct cifs_io_parms io_parms = {0};

	int rc, nbytes;

	int nbytes;

	int rc = 0;

	struct kvec iov[2];



	io_parms.netfid = cfile->fid.netfid;