projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11ab4cd e86cac0)
Merge tag 'Smack-for-6.10' of https://github.com/cschaufler/smack-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Jul 2024 21:56:13 +0000 (14:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Jul 2024 21:56:13 +0000 (14:56 -0700)
Pull smack updates from Casey Schaufler:
 "Two fixes for Smack networking labeling by Konstantin Andreev"

* tag 'Smack-for-6.10' of https://github.com/cschaufler/smack-next:
  smack: unix sockets: fix accept()ed socket label
  smack: tcp: ipv4, fix incorrect labeling

1  2 
security/smack/smack_lsm.c patch | diff1 | diff2 | blob | history

diff --cc security/smack/smack_lsm.c
Simple merge
Linux 6.x block layer and io_uring tree(s)