projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e21165b 5a5409d)
Merge tag '6.7-rc-smb3-server-part2' of git://git.samba.org/ksmbd
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Nov 2023 18:23:53 +0000 (10:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Nov 2023 18:23:53 +0000 (10:23 -0800)
Pull smb server fixes from Steve French:

 - slab out of bounds fix in ACL handling

 - fix malformed request oops

 - minor doc fix

* tag '6.7-rc-smb3-server-part2' of git://git.samba.org/ksmbd:
  ksmbd: handle malformed smb1 message
  ksmbd: fix kernel-doc comment of ksmbd_vfs_kern_path_locked()
  ksmbd: fix slab out of bounds write in smb_inherit_dacl()


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git