aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2020-06-09 16:15:45 +0100
committerDavid Howells <dhowells@redhat.com>2020-06-09 17:21:03 +0100
commit9ca0652596bd924a4023db6b429a0aaaea629826 (patch)
treec7a6d63bc4d08641ff1a488f114ea6fc7314f6f8
parent5749ce92c4b707353cbd934dd0518a1966d7988f (diff)
downloadlinux-mmp-9ca0652596bd924a4023db6b429a0aaaea629826.tar.gz
afs: Fix use of BUG()
Fix afs_compare_addrs() to use WARN_ON(1) instead of BUG() and return 1 (ie. srx_a > srx_b). There's no point trying to put actual error handling in as this should not occur unless a new transport address type is allowed by AFS. And even if it does, in this particular case, it'll just never match unknown types of addresses. This BUG() was more of a 'you need to add a case here' indicator. Reported-by: Kees Cook <keescook@chromium.org> Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Kees Cook <keescook@chromium.org>
-rw-r--r--fs/afs/vl_alias.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/afs/vl_alias.c b/fs/afs/vl_alias.c
index 093895c49c2198..136fc6164e0092 100644
--- a/fs/afs/vl_alias.c
+++ b/fs/afs/vl_alias.c
@@ -73,7 +73,8 @@ static int afs_compare_addrs(const struct sockaddr_rxrpc *srx_a,
}
default:
- BUG();
+ WARN_ON(1);
+ diff = 1;
}
out: