afs: Fix logically dead code in afs_update_cell
PATCH 1/1 afs: Fix logically dead code in afs_update_cell
Fix logically dead code in switch statement.
Notice that *ret* is updated with -ENOMEM before the switch statement at 395:
395 switch (ret) {
396 case -ENODATA:
397 case -EDESTADDRREQ:398 vllist->status = DNS_LOOKUP_GOT_NOT_FOUND;
399 break;
400 case -EAGAIN:
401 case -ECONNREFUSED:
402 vllist->status = DNS_LOOKUP_GOT_TEMP_FAILURE;
403 break;
404 default:
405 vllist->status = DNS_LOOKUP_GOT_LOCAL_FAILURE;
406 break;
407 }
hence, the code in the switch (except for the default case) makes no sense and is logically dead.
Fix this by removing the *ret* assignment at 390:
390 ret = -ENOMEM;
which is apparently wrong.
Addresses-Coverity-ID: 1445439 ("Logically dead code")
--- fs/afs/cell.c | 1 - 1 file changed, 1 deletion(-)
fs/afs/cell.c +0 -1
@@ -387,7 +387,6 @@ 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) goto out_wake;
Signature · 1 line
2.21.0
Quoted 41 lines · Gustavo A. R. Silva
Fix logically dead code in switch statement.
Notice that *ret* is updated with
-ENOMEMbefore the switch statement at 395:395 switch (ret) { 396 case -ENODATA: 397 case -EDESTADDRREQ:398
vllist->status=DNS_LOOKUP_GOT_NOT_FOUND;
399 break;
400 case-EAGAIN:
401 case-ECONNREFUSED:
402vllist->status=DNS_LOOKUP_GOT_TEMP_FAILURE;
403 break;
404 default:
405vllist->status=DNS_LOOKUP_GOT_LOCAL_FAILURE;
406 break;
407 }hence, the code in the switch (except for the default case) makes no sense and is logically dead.
Fix this by removing the *ret* assignment at 390:
390 ret =
-ENOMEM;which is apparently wrong.
Addresses-Coverity-ID: 1445439 ("Logically dead code")
Fixes d5c32c89b208 ("afs: Fix cell DNS lookup")Signed-off-by Gustavo A. R. Silva <[email protected]>--- fs/afs/cell.c | 1 - 1 file changed, 1 deletion(-)fs/afs/cell.c +0
-0
fs/afs/cell.c static int afs_update_cell(struct afs_cell *cell) · line 392
Quoted 7 lines
fs/afs/cell.c +0
-1@@ -387,7 +387,6 @@ 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) goto out_wake;
Looks like the intention here was to return -ENOMEM when afs_alloc_vlserver_list fails, which would mean that the fix should move the assignment within if (!vllist), rather than just removing it. Although it might be fine to just return the error that came from afs_dns_query instead, as you do in this patch.
Marc
David Howells
maintainerQuoted 8 lines · Marc Dionne
Quoted 8 lines
fs/afs/cell.c +0
-0@@ -387,7 +387,6 @@ static int afs_update_cell(struct afs_cell *cell)if (ret == -ENOMEM ) goto out_wake;
Quoted 10 lines
fs/afs/cell.c static int afs_update_cell(struct afs_cell *cell) · line 392
Quoted 4 lines
fs/afs/cell.c +0
-1- ret = -ENOMEM ; vllist =afs_alloc_vlserver_list (0 );if (!vllist) goto out_wake;Looks like the intention here was to return
-ENOMEMwhenafs_alloc_vlserver_listfails, which would mean that the fix should move the assignment within if (!vllist), rather than just removing it. Although it might be fine to just return the error that came fromafs_dns_queryinstead, as you do in this patch.
I think I'd rather return the original error as this patch effects. I'm having a ponder on it.
David