Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"Three small cifs fixes. One fixes a hang under stress, and the other
two are security related"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
cifs: fix MUST SecurityFlags filtering
Complete oplock break jobs before closing file handle
cifs: use memzero_explicit to clear stack buffer
+10
-4
+4
-2
fs/cifs/cifs_debug.c
+4
-2
fs/cifs/cifs_debug.c
···
606
606
*flags = CIFSSEC_MUST_NTLMV2;
607
607
else if ((*flags & CIFSSEC_MUST_NTLM) == CIFSSEC_MUST_NTLM)
608
608
*flags = CIFSSEC_MUST_NTLM;
609
-
else if ((*flags & CIFSSEC_MUST_LANMAN) == CIFSSEC_MUST_LANMAN)
609
+
else if (CIFSSEC_MUST_LANMAN &&
610
+
(*flags & CIFSSEC_MUST_LANMAN) == CIFSSEC_MUST_LANMAN)
610
611
*flags = CIFSSEC_MUST_LANMAN;
611
-
else if ((*flags & CIFSSEC_MUST_PLNTXT) == CIFSSEC_MUST_PLNTXT)
612
+
else if (CIFSSEC_MUST_PLNTXT &&
613
+
(*flags & CIFSSEC_MUST_PLNTXT) == CIFSSEC_MUST_PLNTXT)
612
614
*flags = CIFSSEC_MUST_PLNTXT;
613
615
614
616
*flags |= signflags;
+5
-1
fs/cifs/file.c
+5
-1
fs/cifs/file.c
···
366
366
struct cifsLockInfo *li, *tmp;
367
367
struct cifs_fid fid;
368
368
struct cifs_pending_open open;
369
+
bool oplock_break_cancelled;
369
370
370
371
spin_lock(&cifs_file_list_lock);
371
372
if (--cifs_file->count > 0) {
···
398
397
}
399
398
spin_unlock(&cifs_file_list_lock);
400
399
401
-
cancel_work_sync(&cifs_file->oplock_break);
400
+
oplock_break_cancelled = cancel_work_sync(&cifs_file->oplock_break);
402
401
403
402
if (!tcon->need_reconnect && !cifs_file->invalidHandle) {
404
403
struct TCP_Server_Info *server = tcon->ses->server;
···
409
408
server->ops->close(xid, tcon, &cifs_file->fid);
410
409
_free_xid(xid);
411
410
}
411
+
412
+
if (oplock_break_cancelled)
413
+
cifs_done_oplock_break(cifsi);
412
414
413
415
cifs_del_pending_open(&open);
414
416