Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Browse source

Pull cifs fixes from Steve French:
 "A small set of cifs fixes.

  I am still reviewing some more, recently submitted SMB3 fixes, but
  these three are small and safe and ready now"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix erroneous return value
  cifs: fix potential overflow in cifs_compose_mount_options
  cifs: remove redundant check for null string pointer

...

This commit is contained in:

Linus Torvalds 2016-02-16 10:52:59 -08:00

parent d82834ee13 4b550af519

commit 65c23c65be

3 changed files with 3 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

fs/cifs/cifs_dfs_ref.c

View file

2

fs/cifs/cifsencrypt.c

View file

3

fs/cifs/connect.c

View file