rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-07-23 06:52:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Disable HHOOK(9) support for sockets

Browse Source 
Support was only partly disabled leading to NULL pointer accesses.
Disable it completely.
This commit is contained in:
Sebastian Huber 2017-11-10 11:15:35 +01:00
parent 72d5fa11a8
commit 057656b706
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freebsd/sys/kern/uipc_socket.c
View File

@ -197,8 +197,10 @@ MALLOC_DEFINE(M_PCB, "pcb", "protocol control block");
VNET_ASSERT(curvnet != NULL, \ VNET_ASSERT(curvnet != NULL, \
("%s:%d curvnet is NULL, so=%p", __func__, __LINE__, (so))); ("%s:%d curvnet is NULL, so=%p", __func__, __LINE__, (so)));
#ifndef __rtems__
VNET_DEFINE(struct hhook_head *, socket_hhh[HHOOK_SOCKET_LAST + 1]); VNET_DEFINE(struct hhook_head *, socket_hhh[HHOOK_SOCKET_LAST + 1]);
#define V_socket_hhh VNET(socket_hhh) #define V_socket_hhh VNET(socket_hhh)
#endif /* __rtems__ */
/* /*
* Limit on the number of connections in the listen queue waiting * Limit on the number of connections in the listen queue waiting
@ -2455,6 +2457,7 @@ sorflush(struct socket *so)
static int inline static int inline
hhook_run_socket(struct socket *so, void *hctx, int32_t h_id) hhook_run_socket(struct socket *so, void *hctx, int32_t h_id)
{ {
#ifndef __rtems__
struct socket_hhook_data hhook_data = { struct socket_hhook_data hhook_data = {
.so = so, .so = so,
.hctx = hctx, .hctx = hctx,
@ -2468,6 +2471,9 @@ hhook_run_socket(struct socket *so, void *hctx, int32_t h_id)
/* Ugly but needed, since hhooks return void for now */ /* Ugly but needed, since hhooks return void for now */
return (hhook_data.status); return (hhook_data.status);
#else /* __rtems__ */
return (0);
#endif /* __rtems__ */
} }
/* /*
@ -2735,10 +2741,12 @@ sosetopt(struct socket *so, struct sockopt *sopt)
break; break;
default: default:
#ifndef __rtems__
if (V_socket_hhh[HHOOK_SOCKET_OPT]->hhh_nhooks > 0) if (V_socket_hhh[HHOOK_SOCKET_OPT]->hhh_nhooks > 0)
error = hhook_run_socket(so, sopt, error = hhook_run_socket(so, sopt,
HHOOK_SOCKET_OPT); HHOOK_SOCKET_OPT);
else else
#endif /* __rtems__ */
error = ENOPROTOOPT; error = ENOPROTOOPT;
break; break;
} }
@ -2930,10 +2938,12 @@ integer:
goto integer; goto integer;
default: default:
#ifndef __rtems__
if (V_socket_hhh[HHOOK_SOCKET_OPT]->hhh_nhooks > 0) if (V_socket_hhh[HHOOK_SOCKET_OPT]->hhh_nhooks > 0)
error = hhook_run_socket(so, sopt, error = hhook_run_socket(so, sopt,
HHOOK_SOCKET_OPT); HHOOK_SOCKET_OPT);
else else
#endif /* __rtems__ */
error = ENOPROTOOPT; error = ENOPROTOOPT;
break; break;
} }