OSDN Git Service

Merge branch 'fixes-v4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jun 2018 15:44:15 +0000 (08:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jun 2018 15:44:15 +0000 (08:44 -0700)
commit813835028e9ae1f18cd11bb0ec591d0f0577d96a
tree5c91429f5cb9f0615ca8dbf2406984583ec27deb
parent84bfed40fc25dd052620398fdcc19d8c77f02270
parentb65c32ec5a942ab3ada93a048089a938918aba7f
Merge branch 'fixes-v4.18-rc2' of git://git./linux/kernel/git/jmorris/linux-security

Pull security subsystem fixes from James Morris:

 - Smack: fix a regression caused by 1bbc55131e5

 - X.509: fix a (usually un-seen) bug in RSA signature parsing

* 'fixes-v4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  X.509: unpack RSA signatureValue field from BIT STRING
  Smack: Mark inode instant in smack_task_to_inode