Skip to content

Commit

Permalink
netlabel: Fix NULL pointer exception caused by CALIPSO on IPv4 sockets
Browse files Browse the repository at this point in the history
When calling netlbl_conn_setattr(), addr->sa_family is used
to determine the function behavior. If sk is an IPv4 socket,
but the connect function is called with an IPv6 address,
the function calipso_sock_setattr() is triggered.
Inside this function, the following code is executed:

sk_fullsock(__sk) ? inet_sk(__sk)->pinet6 : NULL;

Since sk is an IPv4 socket, pinet6 is NULL, leading to a
null pointer dereference.

This patch fixes the issue by checking if inet6_sk(sk)
returns a NULL pointer before accessing pinet6.

Signed-off-by: Debin Zhu <mowenroot@163.com>
Signed-off-by: Bitao Ouyang <1985755126@qq.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Fixes: ceba183 ("calipso: Set the calipso socket label to match the secattr.")
Link: https://patch.msgid.link/20250401124018.4763-1-mowenroot@163.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Debin Zhu authored and Jakub Kicinski committed Apr 2, 2025
1 parent acc4d5f commit 078aabd
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions net/ipv6/calipso.c
Original file line number Diff line number Diff line change
Expand Up @@ -1072,8 +1072,13 @@ static int calipso_sock_getattr(struct sock *sk,
struct ipv6_opt_hdr *hop;
int opt_len, len, ret_val = -ENOMSG, offset;
unsigned char *opt;
struct ipv6_txoptions *txopts = txopt_get(inet6_sk(sk));
struct ipv6_pinfo *pinfo = inet6_sk(sk);
struct ipv6_txoptions *txopts;

if (!pinfo)
return -EAFNOSUPPORT;

txopts = txopt_get(pinfo);
if (!txopts || !txopts->hopopt)
goto done;

Expand Down Expand Up @@ -1125,8 +1130,13 @@ static int calipso_sock_setattr(struct sock *sk,
{
int ret_val;
struct ipv6_opt_hdr *old, *new;
struct ipv6_txoptions *txopts = txopt_get(inet6_sk(sk));
struct ipv6_pinfo *pinfo = inet6_sk(sk);
struct ipv6_txoptions *txopts;

if (!pinfo)
return -EAFNOSUPPORT;

txopts = txopt_get(pinfo);
old = NULL;
if (txopts)
old = txopts->hopopt;
Expand All @@ -1153,8 +1163,13 @@ static int calipso_sock_setattr(struct sock *sk,
static void calipso_sock_delattr(struct sock *sk)
{
struct ipv6_opt_hdr *new_hop;
struct ipv6_txoptions *txopts = txopt_get(inet6_sk(sk));
struct ipv6_pinfo *pinfo = inet6_sk(sk);
struct ipv6_txoptions *txopts;

if (!pinfo)
return;

txopts = txopt_get(pinfo);
if (!txopts || !txopts->hopopt)
goto done;

Expand Down

0 comments on commit 078aabd

Please sign in to comment.