Skip to content

Commit bbd9162

Browse files
committed
Merge tag '5.14-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs updates from Steve French: - improve fallocate emulation - DFS fixes - minor multichannel fixes - various cleanup patches, many to address Coverity warnings * tag '5.14-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6: (38 commits) smb3: prevent races updating CurrentMid cifs: fix missing spinlock around update to ses->status cifs: missing null pointer check in cifs_mount smb3: fix possible access to uninitialized pointer to DACL cifs: missing null check for newinode pointer cifs: remove two cases where rc is set unnecessarily in sid_to_id SMB3: Add new info level for query directory cifs: fix NULL dereference in smb2_check_message() smbdirect: missing rc checks while waiting for rdma events cifs: Avoid field over-reading memcpy() smb311: remove dead code for non compounded posix query info cifs: fix SMB1 error path in cifs_get_file_info_unix smb3: fix uninitialized value for port in witness protocol move cifs: fix unneeded null check cifs: use SPDX-Licence-Identifier cifs: convert list_for_each to entry variant in cifs_debug.c cifs: convert list_for_each to entry variant in smb2misc.c cifs: avoid extra calls in posix_info_parse cifs: retry lookup and readdir when EAGAIN is returned. cifs: fix check of dfs interlinks ...
2 parents b97902b + 0fa757b commit bbd9162

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+974
-1949
lines changed

fs/cifs/Kconfig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ config CIFS
1919
select CRYPTO_LIB_DES
2020
select KEYS
2121
select DNS_RESOLVER
22+
select ASN1
23+
select OID_REGISTRY
2224
help
2325
This is the client VFS module for the SMB3 family of NAS protocols,
2426
(including support for the most recent, most secure dialect SMB3.1.1)
@@ -57,6 +59,7 @@ config CIFS
5759
config CIFS_STATS2
5860
bool "Extended statistics"
5961
depends on CIFS
62+
default y
6063
help
6164
Enabling this option will allow more detailed statistics on SMB
6265
request timing to be displayed in /proc/fs/cifs/DebugData and also
@@ -65,8 +68,7 @@ config CIFS_STATS2
6568
for more details. These additional statistics may have a minor effect
6669
on performance and memory utilization.
6770

68-
Unless you are a developer or are doing network performance analysis
69-
or tuning, say N.
71+
If unsure, say Y.
7072

7173
config CIFS_ALLOW_INSECURE_LEGACY
7274
bool "Support legacy servers which use less secure dialects"

fs/cifs/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@ ccflags-y += -I$(src) # needed for trace events
66
obj-$(CONFIG_CIFS) += cifs.o
77

88
cifs-y := trace.o cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o \
9-
inode.o link.o misc.o netmisc.o smbencrypt.o transport.o asn1.o \
9+
inode.o link.o misc.o netmisc.o smbencrypt.o transport.o \
1010
cifs_unicode.o nterr.o cifsencrypt.o \
1111
readdir.o ioctl.o sess.o export.o smb1ops.o unc.o winucase.o \
1212
smb2ops.o smb2maperror.o smb2transport.o \
1313
smb2misc.o smb2pdu.o smb2inode.o smb2file.o cifsacl.o fs_context.o \
14-
dns_resolve.o
14+
dns_resolve.o cifs_spnego_negtokeninit.asn1.o asn1.o
15+
16+
$(obj)/asn1.o: $(obj)/cifs_spnego_negtokeninit.asn1.h
17+
18+
$(obj)/cifs_spnego_negtokeninit.asn1.o: $(obj)/cifs_spnego_negtokeninit.asn1.c $(obj)/cifs_spnego_negtokeninit.asn1.h
1519

1620
cifs-$(CONFIG_CIFS_XATTR) += xattr.o
1721

0 commit comments

Comments
 (0)