From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Feb 2019 17:09:33 +0000 (-0800)
Subject: Merge branch 'fixes-v5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorri... 
X-Git-Tag: v5.0-rc8~22
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1f5a018c5b15c2e3e519ae8ca9bfb03a00384448;p=linux-2.6-block.git

Merge branch 'fixes-v5.1-rc6' of git://git./linux/kernel/git/jmorris/linux-security

Pull keys fixes from James Morris:

 - Handle quotas better, allowing full quota to be reached.

 - Fix the creation of shortcuts in the assoc_array internal
   representation when the index key needs to be an exact multiple of
   the machine word size.

 - Fix a dependency loop between the request_key contruction record and
   the request_key authentication key. The construction record isn't
   really necessary and can be dispensed with.

 - Set the timestamp on a new key rather than leaving it as 0. This
   would ordinarily be fine - provided the system clock is never set to
   a time before 1970

* 'fixes-v5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  keys: Timestamp new keys
  keys: Fix dependency loop between construction record and auth key
  assoc_array: Fix shortcut creation
  KEYS: allow reaching the keys quotas exactly
---

1f5a018c5b15c2e3e519ae8ca9bfb03a00384448