Commit 19eef1d9 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

afs: Fix uninit var in afs_alloc_anon_key() 



Fix an uninitialised variable (key) in afs_alloc_anon_key() by setting it
to cell->anonymous_key.  Without this change, the error check may return a
false failure with a bad error number.

Most of the time this is unlikely to happen because the first encounter
with afs_alloc_anon_key() will usually be from (auto)mount, for which all
subsequent operations must wait - apart from other (auto)mounts.  Once the
call->anonymous_key is allocated, all further calls to afs_request_key()
will skip the call to afs_alloc_anon_key() for that cell.

Fixes: d27c7125 ("afs: Fix delayed allocation of a cell's anonymous key")
Reported-by: default avatarPaulo Alcantra <pc@manguebit.org>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarPaulo Alcantara <pc@manguebit.org>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: syzbot+41c68824eefb67cdf00c@syzkaller.appspotmail.com
cc: linux-afs@lists.infradead.org
cc: linux-fsdevel@vger.kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e6640487

fs/afs/security.c

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ static int afs_alloc_anon_key(struct afs_cell *cell) 
	struct key *key;



	mutex_lock(&afs_key_lock);

	if (!cell->anonymous_key) {

	key = cell->anonymous_key;

	if (!key) {

		key = rxrpc_get_null_key(cell->key_desc);

		if (!IS_ERR(key))

			cell->anonymous_key = key;