tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds f3438b4c c7d10223

options
unified split
Changed files
+10 -2
fs
cifs
file.c
fs_context.c
smb2ops.c
+1 -1
fs/cifs/file.c
··· 4619 4619 4620 4620 static int cifs_readpage(struct file *file, struct page *page) 4621 4621 { 4622 - loff_t offset = (loff_t)page->index << PAGE_SHIFT; 4622 + loff_t offset = page_file_offset(page); 4623 4623 int rc = -EACCES; 4624 4624 unsigned int xid; 4625 4625
+7
fs/cifs/fs_context.c
··· 925 925 ctx->cred_uid = uid; 926 926 ctx->cruid_specified = true; 927 927 break; 928 + case Opt_backupuid: 929 + uid = make_kuid(current_user_ns(), result.uint_32); 930 + if (!uid_valid(uid)) 931 + goto cifs_parse_mount_err; 932 + ctx->backupuid = uid; 933 + ctx->backupuid_specified = true; 934 + break; 928 935 case Opt_backupgid: 929 936 gid = make_kgid(current_user_ns(), result.uint_32); 930 937 if (!gid_valid(gid))
+2 -1
fs/cifs/smb2ops.c
··· 3617 3617 char *buf) 3618 3618 { 3619 3619 struct cifs_io_parms io_parms = {0}; 3620 - int rc, nbytes; 3620 + int nbytes; 3621 + int rc = 0; 3621 3622 struct kvec iov[2]; 3622 3623 3623 3624 io_parms.netfid = cfile->fid.netfid;