History

afs: Fix overwriting of result of DNS query

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].

David Howells committed 2 years ago

Commit a9e01ac1 parent 937fd401 file · +4 −2Browse files

Unified · Split

fs/afs/cell.c+4−2
@@ -409,10 +409,12 @@ static int afs_update_cell(struct afs_cell *cell) · 408 unmodified lines
409409 if (ret == -ENOMEM)
410410 goto out_wake;
411411
412− ret = -ENOMEM;
413412 vllist = afs_alloc_vlserver_list(0);
414− if (!vllist)
413+ if (!vllist) {
414+ if (ret >= 0)
415+ ret = -ENOMEM;
415416 goto out_wake;
417+ }
416418
417419 switch (ret) {
418420 case -ENODATA:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t