aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCong Wang <[email protected]>2024-08-25 12:16:38 -0700
committerJakub Kicinski <[email protected]>2024-08-27 14:19:40 -0700
commitdefd8b3c37b0f9cb3e0f60f47d3d78d459d57fda (patch)
treee2d53b01dfcd17753a79378e455105201f924803
parentMerge branch 'fixes-for-ipsec-over-bonding' (diff)
downloadwireguard-linux-defd8b3c37b0f9cb3e0f60f47d3d78d459d57fda.tar.xz
wireguard-linux-defd8b3c37b0f9cb3e0f60f47d3d78d459d57fda.zip
gtp: fix a potential NULL pointer dereference
When sockfd_lookup() fails, gtp_encap_enable_socket() returns a NULL pointer, but its callers only check for error pointers thus miss the NULL pointer case. Fix it by returning an error pointer with the error code carried from sockfd_lookup(). (I found this bug during code inspection.) Fixes: 1e3a3abd8b28 ("gtp: make GTP sockets in gtp_newlink optional") Cc: Andreas Schultz <[email protected]> Cc: Harald Welte <[email protected]> Signed-off-by: Cong Wang <[email protected]> Reviewed-by: Simon Horman <[email protected]> Reviewed-by: Pablo Neira Ayuso <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
-rw-r--r--drivers/net/gtp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c
index 0696faf60013..2e94d10348cc 100644
--- a/drivers/net/gtp.c
+++ b/drivers/net/gtp.c
@@ -1653,7 +1653,7 @@ static struct sock *gtp_encap_enable_socket(int fd, int type,
sock = sockfd_lookup(fd, &err);
if (!sock) {
pr_debug("gtp socket fd=%d not found\n", fd);
- return NULL;
+ return ERR_PTR(err);
}
sk = sock->sk;
OSZAR »