Page MenuHomeFreeBSD
Files F137286282

D53868.id.diff
No OneTemporary
Actions

D53868.id.diff
View Options

diff --git a/sys/net/bpf.c b/sys/net/bpf.c
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -183,7 +183,6 @@
CK_LIST_HEAD(bpf_iflist, bpf_if);
static struct bpf_iflist bpf_iflist = CK_LIST_HEAD_INITIALIZER();
static struct sx bpf_sx; /* bpf global lock */
-static int bpf_bpfd_cnt;
static void bpfif_ref(struct bpf_if *);
static void bpfif_rele(struct bpf_if *);
@@ -765,7 +764,6 @@
bpf_wakeup(d);
BPFD_UNLOCK(d);
- bpf_bpfd_cnt++;
CTR3(KTR_NET, "%s: bpf_attach called by pid %d, adding to %s list",
__func__, d->bd_pid, d->bd_writer ? "writer" : "active");
@@ -869,7 +867,6 @@
bpf_wakeup(d);
}
BPFD_UNLOCK(d);
- bpf_bpfd_cnt--;
/* Call event handler iff d is attached */
if (error == 0)
@@ -3049,7 +3046,8 @@
{
static const struct xbpf_d zerostats;
struct xbpf_d *xbdbuf, *xbd, tempstats;
- int index, error;
+ u_int bpfd_cnt, index;
+ int error;
struct bpf_if *bp;
struct bpf_d *bd;
@@ -3079,19 +3077,26 @@
bpf_zero_counters();
return (0);
}
- if (req->oldptr == NULL)
- return (SYSCTL_OUT(req, 0, bpf_bpfd_cnt * sizeof(*xbd)));
- if (bpf_bpfd_cnt == 0)
- return (SYSCTL_OUT(req, 0, 0));
- xbdbuf = malloc(req->oldlen, M_BPF, M_WAITOK);
+ bpfd_cnt = 0;
BPF_LOCK();
- if (req->oldlen < (bpf_bpfd_cnt * sizeof(*xbd))) {
+ CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) {
+ CK_LIST_FOREACH(bd, &bp->bif_wlist, bd_next)
+ bpfd_cnt++;
+ CK_LIST_FOREACH(bd, &bp->bif_dlist, bd_next)
+ bpfd_cnt++;
+ }
+ if (bpfd_cnt == 0 || req->oldptr == NULL) {
+ BPF_UNLOCK();
+ return (SYSCTL_OUT(req, 0, bpfd_cnt * sizeof(*xbd)));
+ }
+ if (req->oldlen < bpfd_cnt * sizeof(*xbd)) {
BPF_UNLOCK();
- free(xbdbuf, M_BPF);
return (ENOMEM);
}
+ xbdbuf = malloc(req->oldlen, M_BPF, M_WAITOK);
index = 0;
CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) {
+ MPASS(index <= bpfd_cnt);
/* Send writers-only first */
CK_LIST_FOREACH(bd, &bp->bif_wlist, bd_next) {
xbd = &xbdbuf[index++];

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 23, 1:53 AM (4 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25992629
Default Alt Text
D53868.id.diff (1 KB)

Event Timeline