Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux
Pull two nfsd bugfixes from Bruce Fields.
* 'for-3.14' of git://linux-nfs.org/~bfields/linux:
lockd: send correct lock when granting a delayed lock.
nfsd4: fix acl buffer overrun
+11
-6
+8
fs/lockd/svclock.c
+8
fs/lockd/svclock.c
···
779
779
struct nlm_file *file = block->b_file;
780
780
struct nlm_lock *lock = &block->b_call->a_args.lock;
781
781
int error;
782
+
loff_t fl_start, fl_end;
782
783
783
784
dprintk("lockd: grant blocked lock %p\n", block);
784
785
···
797
796
}
798
797
799
798
/* Try the lock operation again */
799
+
/* vfs_lock_file() can mangle fl_start and fl_end, but we need
800
+
* them unchanged for the GRANT_MSG
801
+
*/
800
802
lock->fl.fl_flags |= FL_SLEEP;
803
+
fl_start = lock->fl.fl_start;
804
+
fl_end = lock->fl.fl_end;
801
805
error = vfs_lock_file(file->f_file, F_SETLK, &lock->fl, NULL);
802
806
lock->fl.fl_flags &= ~FL_SLEEP;
807
+
lock->fl.fl_start = fl_start;
808
+
lock->fl.fl_end = fl_end;
803
809
804
810
switch (error) {
805
811
case 0:
+3
-6
fs/nfsd/nfs4acl.c
+3
-6
fs/nfsd/nfs4acl.c
···
151
151
pacl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
152
152
if (IS_ERR(pacl))
153
153
return PTR_ERR(pacl);
154
-
/* allocate for worst case: one (deny, allow) pair each: */
155
-
size += 2 * pacl->a_count;
156
154
}
155
+
/* allocate for worst case: one (deny, allow) pair each: */
156
+
size += 2 * pacl->a_count;
157
157
158
158
if (S_ISDIR(inode->i_mode)) {
159
159
flags = NFS4_ACL_DIR;
160
160
dpacl = get_acl(inode, ACL_TYPE_DEFAULT);
161
161
if (dpacl)
162
162
size += 2 * dpacl->a_count;
163
-
} else {
164
-
dpacl = NULL;
165
163
}
166
164
167
165
*acl = nfs4_acl_new(size);
···
168
170
goto out;
169
171
}
170
172
171
-
if (pacl)
172
-
_posix_to_nfsv4_one(pacl, *acl, flags & ~NFS4_ACL_TYPE_DEFAULT);
173
+
_posix_to_nfsv4_one(pacl, *acl, flags & ~NFS4_ACL_TYPE_DEFAULT);
173
174
174
175
if (dpacl)
175
176
_posix_to_nfsv4_one(dpacl, *acl, flags | NFS4_ACL_TYPE_DEFAULT);