From 1c095512362b7c32ff122ac5bddc36709f01adac Mon Sep 17 00:00:00 2001 From: Mirko Covizzi Date: Fri, 12 Jan 2024 17:21:22 +0100 Subject: [PATCH] [nrf fromtree] net: sockets: prevent null pointer dereference According to the POSIX specification, null pointer is a valid value for the `address` argument of the `accept` function. This commit adds a check to prevent a null pointer dereference inside `z_impl_zsock_accept`. Signed-off-by: Mirko Covizzi (cherry picked from commit f3b2c04661370ac595faf32d2cafb43506704671) --- subsys/net/lib/sockets/sockets.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c index d35317352c9..060c7fff8f7 100644 --- a/subsys/net/lib/sockets/sockets.c +++ b/subsys/net/lib/sockets/sockets.c @@ -681,7 +681,9 @@ int z_impl_zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen) new_sock = VTABLE_CALL(accept, sock, addr, addrlen); - (void)sock_obj_core_alloc_find(sock, new_sock, addr->sa_family, SOCK_STREAM); + if (addr) { + (void)sock_obj_core_alloc_find(sock, new_sock, addr->sa_family, SOCK_STREAM); + } return new_sock; }