mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-26 09:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug #36840 snmp_send_trap() NULL de-reference if traps configured but no interfaces available

Browse Source
This commit is contained in:
goldsimon 2012-08-13 21:38:30 +02:00
parent 556a2126b5
commit b82bca7c99
2 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -80,6 +80,10 @@ HISTORY
++ Bugfixes: ++ Bugfixes:
2012-08-13: Simon Goldschmidt
* msg_out.c: fixed bug #36840 snmp_send_trap() NULL de-reference if traps
configured but no interfaces available
2012-08-13: Simon Goldschmidt 2012-08-13: Simon Goldschmidt
* dns.c: fixed bug #36899 DNS TTL 0 is cached for a long time * dns.c: fixed bug #36899 DNS TTL 0 is cached for a long time

84
src/core/snmp/msg_out.c
View File

@ -217,6 +217,7 @@ snmp_send_trap(s8_t generic_trap, struct snmp_obj_id *eoid, s32_t specific_trap)
ip_addr_t dst_ip; ip_addr_t dst_ip;
struct pbuf *p; struct pbuf *p;
u16_t i,tot_len; u16_t i,tot_len;
err_t err = ERR_OK;
for (i=0, td = &trap_dst[0]; i<SNMP_TRAP_DESTINATIONS; i++, td++) for (i=0, td = &trap_dst[0]; i<SNMP_TRAP_DESTINATIONS; i++, td++)
{ {
@ -226,55 +227,58 @@ snmp_send_trap(s8_t generic_trap, struct snmp_obj_id *eoid, s32_t specific_trap)
ip_addr_copy(trap_msg.dip, td->dip); ip_addr_copy(trap_msg.dip, td->dip);
/* lookup current source address for this dst */ /* lookup current source address for this dst */
dst_if = ip_route(&td->dip); dst_if = ip_route(&td->dip);
ip_addr_copy(dst_ip, dst_if->ip_addr); if (dst_if != NULL) {
/* @todo: what about IPv6? */ ip_addr_copy(dst_ip, dst_if->ip_addr);
trap_msg.sip_raw[0] = ip4_addr1(&dst_ip); /* @todo: what about IPv6? */
trap_msg.sip_raw[1] = ip4_addr2(&dst_ip); trap_msg.sip_raw[0] = ip4_addr1(&dst_ip);
trap_msg.sip_raw[2] = ip4_addr3(&dst_ip); trap_msg.sip_raw[1] = ip4_addr2(&dst_ip);
trap_msg.sip_raw[3] = ip4_addr4(&dst_ip); trap_msg.sip_raw[2] = ip4_addr3(&dst_ip);
trap_msg.gen_trap = generic_trap; trap_msg.sip_raw[3] = ip4_addr4(&dst_ip);
trap_msg.spc_trap = specific_trap; trap_msg.gen_trap = generic_trap;
if (generic_trap == SNMP_GENTRAP_ENTERPRISESPC) trap_msg.spc_trap = specific_trap;
{ if (generic_trap == SNMP_GENTRAP_ENTERPRISESPC)
/* enterprise-Specific trap */ {
trap_msg.enterprise = eoid; /* enterprise-Specific trap */
} trap_msg.enterprise = eoid;
else }
{ else
/* generic (MIB-II) trap */ {
snmp_get_snmpgrpid_ptr(&trap_msg.enterprise); /* generic (MIB-II) trap */
} snmp_get_snmpgrpid_ptr(&trap_msg.enterprise);
snmp_get_sysuptime(&trap_msg.ts); }
snmp_get_sysuptime(&trap_msg.ts);
/* pass 0, calculate length fields */ /* pass 0, calculate length fields */
tot_len = snmp_varbind_list_sum(&trap_msg.outvb); tot_len = snmp_varbind_list_sum(&trap_msg.outvb);
tot_len = snmp_trap_header_sum(&trap_msg, tot_len); tot_len = snmp_trap_header_sum(&trap_msg, tot_len);
/* allocate pbuf(s) */ /* allocate pbuf(s) */
p = pbuf_alloc(PBUF_TRANSPORT, tot_len, PBUF_POOL); p = pbuf_alloc(PBUF_TRANSPORT, tot_len, PBUF_POOL);
if (p != NULL) if (p != NULL)
{ {
u16_t ofs; u16_t ofs;
/* pass 1, encode packet ino the pbuf(s) */ /* pass 1, encode packet ino the pbuf(s) */
ofs = snmp_trap_header_enc(&trap_msg, p); ofs = snmp_trap_header_enc(&trap_msg, p);
snmp_varbind_list_enc(&trap_msg.outvb, p, ofs); snmp_varbind_list_enc(&trap_msg.outvb, p, ofs);
snmp_inc_snmpouttraps(); snmp_inc_snmpouttraps();
snmp_inc_snmpoutpkts(); snmp_inc_snmpoutpkts();
/** send to the TRAP destination */ /** send to the TRAP destination */
udp_sendto(trap_msg.pcb, p, &trap_msg.dip, SNMP_TRAP_PORT); udp_sendto(trap_msg.pcb, p, &trap_msg.dip, SNMP_TRAP_PORT);
pbuf_free(p); pbuf_free(p);
} } else {
else err = ERR_MEM;
{ }
return ERR_MEM; } else {
/* routing error */
err = ERR_RTE;
} }
} }
} }
return ERR_OK; return err;
} }
void void