[PATCH] afs: Fix missing error pointer check after rxrpc_kernel_lookup_peer()

Miaoqian Lin posted 1 patch 2 months ago
fs/afs/addr_list.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] afs: Fix missing error pointer check after rxrpc_kernel_lookup_peer()
Posted by Miaoqian Lin 2 months ago
rxrpc_kernel_lookup_peer() can also return error pointers.
Add an IS_ERR_OR_NULL() check to handle both error and NULL returns.
This prevents possible crashes from invalid pointer dereference.

Fixes: 72904d7b9bfb ("rxrpc, afs: Allow afs to pin rxrpc_peer objects")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 fs/afs/addr_list.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/afs/addr_list.c b/fs/afs/addr_list.c
index e941da5b6dd9..1f8d1a8a92c3 100644
--- a/fs/afs/addr_list.c
+++ b/fs/afs/addr_list.c
@@ -298,7 +298,7 @@ int afs_merge_fs_addr4(struct afs_net *net, struct afs_addr_list *alist,
 	srx.transport.sin.sin_addr.s_addr = xdr;
 
 	peer = rxrpc_kernel_lookup_peer(net->socket, &srx, GFP_KERNEL);
-	if (!peer)
+	if (IS_ERR_OR_NULL(peer))
 		return -ENOMEM;
 
 	for (i = 0; i < alist->nr_ipv4; i++) {
@@ -342,7 +342,7 @@ int afs_merge_fs_addr6(struct afs_net *net, struct afs_addr_list *alist,
 	memcpy(&srx.transport.sin6.sin6_addr, xdr, 16);
 
 	peer = rxrpc_kernel_lookup_peer(net->socket, &srx, GFP_KERNEL);
-	if (!peer)
+	if (IS_ERR_OR_NULL(peer))
 		return -ENOMEM;
 
 	for (i = alist->nr_ipv4; i < alist->nr_addrs; i++) {
-- 
2.25.1