mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 18:07:25 +00:00
Code Issues Releases Wiki Activity

[master] Correct size for buffer allocation

Browse Source
This commit is contained in:
Shawn Routhier 2016-01-19 19:01:39 -08:00
parent fd1ba3638a
commit ba4c704dba
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELNOTES
View File

@ -163,7 +163,12 @@ by Eric Young (eay@cryptsoft.com).
update as an "invalid state transition". update as an "invalid state transition".
[ISC_BUGS #25189] [ISC_BUGS #25189]
- Properly allocate memory for a bpf filter.
Thanks to Bill Parker (wp02855 at gmail dot com) who identified this issue.
[ISC-Bugs #41485]
Changes since 4.3.3b1 Changes since 4.3.3b1
- None - None
Changes since 4.3.2 Changes since 4.3.2

6
common/bpf.c
View File

@ -3,7 +3,7 @@
BPF socket interface code, originally contributed by Archie Cobbs. */ BPF socket interface code, originally contributed by Archie Cobbs. */
/* /*
* Copyright (c) 2009,2012-2014 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2009,2012-2014,2016 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996-2003 by Internet Software Consortium * Copyright (c) 1996-2003 by Internet Software Consortium
* *
@ -200,7 +200,7 @@ struct bpf_insn dhcp_bpf_filter [] = {
}; };
#if defined (DEC_FDDI) #if defined (DEC_FDDI)
struct bpf_insn *bpf_fddi_filter; struct bpf_insn *bpf_fddi_filter = NULL;
#endif #endif
int dhcp_bpf_filter_len = sizeof dhcp_bpf_filter / sizeof (struct bpf_insn); int dhcp_bpf_filter_len = sizeof dhcp_bpf_filter / sizeof (struct bpf_insn);
@ -285,7 +285,7 @@ void if_register_receive (info)
if (ioctl(info -> rfdesc, BIOCGDLT, &link_layer) >= 0 && if (ioctl(info -> rfdesc, BIOCGDLT, &link_layer) >= 0 &&
link_layer == DLT_FDDI) { link_layer == DLT_FDDI) {
if (!bpf_fddi_filter) { if (!bpf_fddi_filter) {
bpf_fddi_filter = dmalloc (sizeof bpf_fddi_filter, bpf_fddi_filter = dmalloc (sizeof dhcp_bpf_filter,
MDL); MDL);
if (!bpf_fddi_filter) if (!bpf_fddi_filter)
log_fatal ("No memory for FDDI filter."); log_fatal ("No memory for FDDI filter.");