summaryrefslogtreecommitdiffstats
path: root/sys/netgraph
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2010-04-30 07:09:13 +0000
committertrasz <trasz@FreeBSD.org>2010-04-30 07:09:13 +0000
commit86ba030e212082976c91dd5151f22b3d40b7dec0 (patch)
treef2225d6b80d5236bc5d6ce47a110db043ba8195a /sys/netgraph
parentae5c8abad9e011d84fbe6f903242c206fb4d5e5d (diff)
downloadFreeBSD-src-86ba030e212082976c91dd5151f22b3d40b7dec0.zip
FreeBSD-src-86ba030e212082976c91dd5151f22b3d40b7dec0.tar.gz
Avoid undefined behaviour.
Reviewed by: zec@
Diffstat (limited to 'sys/netgraph')
-rw-r--r--sys/netgraph/ng_pipe.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c
index a094646..a454624 100644
--- a/sys/netgraph/ng_pipe.c
+++ b/sys/netgraph/ng_pipe.c
@@ -816,14 +816,17 @@ pipe_dequeue(struct hookinfo *hinfo, struct timeval *now) {
}
/* Randomly discard the frame, according to BER setting */
- if (hinfo->cfg.ber &&
- ((oldrand = rand) ^ (rand = random())<<17) >=
- hinfo->ber_p[priv->overhead + m->m_pkthdr.len] ) {
- hinfo->stats.out_disc_frames++;
- hinfo->stats.out_disc_octets += m->m_pkthdr.len;
- uma_zfree(ngp_zone, ngp_h);
- m_freem(m);
- continue;
+ if (hinfo->cfg.ber) {
+ oldrand = rand;
+ rand = random();
+ if (((oldrand ^ rand) << 17) >=
+ hinfo->ber_p[priv->overhead + m->m_pkthdr.len]) {
+ hinfo->stats.out_disc_frames++;
+ hinfo->stats.out_disc_octets += m->m_pkthdr.len;
+ uma_zfree(ngp_zone, ngp_h);
+ m_freem(m);
+ continue;
+ }
}
/* Discard frame if outbound queue size limit exceeded */
OpenPOWER on IntegriCloud