DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

hostapd_allowed_address() is called from hostapd_config_reload_sta() with

Browse source 
session_timeout and acct_interim_interval set to NULL.  Without checking
these before accessing, we'd cause a NULL pointer access in this case.  In
ieee802_11.c calls hostapd_allowed_address() with valid pointers.
This commit is contained in:
Chris Zimmermann 2008-03-12 11:39:56 +02:00 committed by Jouni Malinen
parent 658d166297
commit b6745143e8
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hostapd/ieee802_11_auth.c
View file

@ -74,8 +74,12 @@ static int hostapd_acl_cache_get(struct hostapd_data *hapd, const u8 *addr,
if (now - entry->timestamp > RADIUS_ACL_TIMEOUT) if (now - entry->timestamp > RADIUS_ACL_TIMEOUT)
return -1; /* entry has expired */ return -1; /* entry has expired */
if (entry->accepted == HOSTAPD_ACL_ACCEPT_TIMEOUT) if (entry->accepted == HOSTAPD_ACL_ACCEPT_TIMEOUT)
*session_timeout = entry->session_timeout; if (session_timeout)
*acct_interim_interval = entry->acct_interim_interval; *session_timeout =
entry->session_timeout;
if (acct_interim_interval)
*acct_interim_interval =
entry->acct_interim_interval;
if (vlan_id) if (vlan_id)
*vlan_id = entry->vlan_id; *vlan_id = entry->vlan_id;
return entry->accepted; return entry->accepted;
@ -192,7 +196,9 @@ int hostapd_allowed_address(struct hostapd_data *hapd, const u8 *addr,
const u8 *msg, size_t len, u32 *session_timeout, const u8 *msg, size_t len, u32 *session_timeout,
u32 *acct_interim_interval, int *vlan_id) u32 *acct_interim_interval, int *vlan_id)
{ {
if (session_timeout)
*session_timeout = 0; *session_timeout = 0;
if (acct_interim_interval)
*acct_interim_interval = 0; *acct_interim_interval = 0;
if (vlan_id) if (vlan_id)
*vlan_id = 0; *vlan_id = 0;