Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47ae5242 authored by David Howells's avatar David Howells Committed by Greg Kroah-Hartman
Browse files

afs: Fix overwriting of result of DNS query 



[ Upstream commit a9e01ac8c5ff32669119c40dfdc9e80eb0b7d7aa ]

In afs_update_cell(), ret is the result of the DNS lookup and the errors
are to be handled by a switch - however, the value gets clobbered in
between by setting it to -ENOMEM in case afs_alloc_vlserver_list()
fails.

Fix this by moving the setting of -ENOMEM into the error handling for
OOM failure.  Further, only do it if we don't have an alternative error
to return.

Found by Linux Verification Center (linuxtesting.org) with SVACE.  Based
on a patch from Anastasia Belova [1].

Fixes: d5c32c89 ("afs: Fix cell DNS lookup")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarJeffrey Altman <jaltman@auristor.com>
cc: Anastasia Belova <abelova@astralinux.ru>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
cc: lvc-project@linuxtesting.org
Link: https://lore.kernel.org/r/20231221085849.1463-1-abelova@astralinux.ru/ [1]
Link: https://lore.kernel.org/r/1700862.1703168632@warthog.procyon.org.uk/

 # v1
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c04b7b28

fs/afs/cell.c

+4 −2
Original line number Diff line number Diff line
@@ -404,10 +404,12 @@ static int afs_update_cell(struct afs_cell *cell) 
		if (ret == -ENOMEM)

			goto out_wake;



		ret = -ENOMEM;

		vllist = afs_alloc_vlserver_list(0);

		if (!vllist)

		if (!vllist) {

			if (ret >= 0)

				ret = -ENOMEM;

			goto out_wake;

		}



		switch (ret) {

		case -ENODATA: