From: Linus Torvalds Date: Sat, 4 Apr 2020 19:24:47 +0000 (-0700) Subject: Merge tag 'keys-fixes-20200329' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.7-rc1~86 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/4c205c84e249e0a91dcfabe461d77667ec9b2d05 Merge tag 'keys-fixes-20200329' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs Pull keyrings fixes from David Howells: "Here's a couple of patches that fix a circular dependency between holding key->sem and mm->mmap_sem when reading data from a key. One potential issue is that a filesystem looking to use a key inside, say, ->readpages() could deadlock if the key being read is the key that's required and the buffer the key is being read into is on a page that needs to be fetched. The case actually detected is a bit more involved - with a filesystem calling request_key() and locking the target keyring for write - which could be being read" * tag 'keys-fixes-20200329' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs: KEYS: Avoid false positive ENOMEM error on key read KEYS: Don't write out to userspace while holding key semaphore --- 4c205c84e249e0a91dcfabe461d77667ec9b2d05