diff options
author | Waiman Long <longman@redhat.com> | 2020-03-21 21:11:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-02 17:24:18 +0200 |
commit | 8d952266c3de93b6eea602803b3d6ad532c8fc0b (patch) | |
tree | 9466d41fb15d2e2510f5ea52eb8642b6e002cebc /security/keys/dh.c | |
parent | bd7ecda215cda3e918d4fba2e5a4b9004196fe93 (diff) | |
download | linux-stable-8d952266c3de93b6eea602803b3d6ad532c8fc0b.tar.gz linux-stable-8d952266c3de93b6eea602803b3d6ad532c8fc0b.tar.bz2 linux-stable-8d952266c3de93b6eea602803b3d6ad532c8fc0b.zip |
KEYS: Avoid false positive ENOMEM error on key read
[ Upstream commit 4f0882491a148059a52480e753b7f07fc550e188 ]
By allocating a kernel buffer with a user-supplied buffer length, it
is possible that a false positive ENOMEM error may be returned because
the user-supplied length is just too large even if the system do have
enough memory to hold the actual key data.
Moreover, if the buffer length is larger than the maximum amount of
memory that can be returned by kmalloc() (2^(MAX_ORDER-1) number of
pages), a warning message will also be printed.
To reduce this possibility, we set a threshold (PAGE_SIZE) over which we
do check the actual key length first before allocating a buffer of the
right size to hold it. The threshold is arbitrary, it is just used to
trigger a buffer length check. It does not limit the actual key length
as long as there is enough memory to satisfy the memory request.
To further avoid large buffer allocation failure due to page
fragmentation, kvmalloc() is used to allocate the buffer so that vmapped
pages can be used when there is not a large enough contiguous set of
pages available for allocation.
In the extremely unlikely scenario that the key keeps on being changed
and made longer (still <= buflen) in between 2 __keyctl_read_key()
calls, the __keyctl_read_key() calling loop in keyctl_read_key() may
have to be iterated a large number of times, but definitely not infinite.
Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'security/keys/dh.c')
0 files changed, 0 insertions, 0 deletions