aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2021-05-18 19:22:21 +0000
committerMark Johnston <markj@FreeBSD.org>2021-05-25 13:29:00 +0000
commit419a11681c22ce12d3b9a4ab9ab45ff6b7c4ce83 (patch)
tree99bf7572f9dbb04e9eee9e4843fe174765041446
parent3a84efbedca5c8c45e40bdcaa4e1ae0e15fff94d (diff)
downloadsrc-419a11681c22ce12d3b9a4ab9ab45ff6b7c4ce83.tar.gz
src-419a11681c22ce12d3b9a4ab9ab45ff6b7c4ce83.zip
dummynet: Fix mbuf tag allocation failure handling
PR: 255875, 255878, 255879, 255880 Reviewed by: donner, kp Sponsored by: The FreeBSD Foundation (cherry picked from commit c4a6258d70f73c27d8f0c6233edbcc609791806b)
-rw-r--r--sys/netpfil/ipfw/dn_aqm_codel.c4
-rw-r--r--sys/netpfil/ipfw/dn_aqm_pie.c6
-rw-r--r--sys/netpfil/ipfw/dn_sched_fq_codel.c4
-rw-r--r--sys/netpfil/ipfw/dn_sched_fq_pie.c6
4 files changed, 8 insertions, 12 deletions
diff --git a/sys/netpfil/ipfw/dn_aqm_codel.c b/sys/netpfil/ipfw/dn_aqm_codel.c
index a095b33b0833..8e90dcdb1e5b 100644
--- a/sys/netpfil/ipfw/dn_aqm_codel.c
+++ b/sys/netpfil/ipfw/dn_aqm_codel.c
@@ -253,10 +253,8 @@ aqm_codel_enqueue(struct dn_queue *q, struct mbuf *m)
if (mtag == NULL)
mtag = m_tag_alloc(MTAG_ABI_COMPAT, DN_AQM_MTAG_TS,
sizeof(aqm_time_t), M_NOWAIT);
- if (mtag == NULL) {
- m_freem(m);
+ if (mtag == NULL)
goto drop;
- }
*(aqm_time_t *)(mtag + 1) = AQM_UNOW;
m_tag_prepend(m, mtag);
diff --git a/sys/netpfil/ipfw/dn_aqm_pie.c b/sys/netpfil/ipfw/dn_aqm_pie.c
index c306a4caac9d..e106fd0121f3 100644
--- a/sys/netpfil/ipfw/dn_aqm_pie.c
+++ b/sys/netpfil/ipfw/dn_aqm_pie.c
@@ -543,11 +543,11 @@ aqm_pie_enqueue(struct dn_queue *q, struct mbuf* m)
mtag = m_tag_alloc(MTAG_ABI_COMPAT, DN_AQM_MTAG_TS,
sizeof(aqm_time_t), M_NOWAIT);
if (mtag == NULL) {
- m_freem(m);
t = DROP;
+ } else {
+ *(aqm_time_t *)(mtag + 1) = AQM_UNOW;
+ m_tag_prepend(m, mtag);
}
- *(aqm_time_t *)(mtag + 1) = AQM_UNOW;
- m_tag_prepend(m, mtag);
}
if (t != DROP) {
diff --git a/sys/netpfil/ipfw/dn_sched_fq_codel.c b/sys/netpfil/ipfw/dn_sched_fq_codel.c
index 44610aaf9740..d2fe6a76f1cc 100644
--- a/sys/netpfil/ipfw/dn_sched_fq_codel.c
+++ b/sys/netpfil/ipfw/dn_sched_fq_codel.c
@@ -187,10 +187,8 @@ codel_enqueue(struct fq_codel_flow *q, struct mbuf *m, struct fq_codel_si *si)
if (mtag == NULL)
mtag = m_tag_alloc(MTAG_ABI_COMPAT, DN_AQM_MTAG_TS, sizeof(aqm_time_t),
M_NOWAIT);
- if (mtag == NULL) {
- m_freem(m);
+ if (mtag == NULL)
goto drop;
- }
*(aqm_time_t *)(mtag + 1) = AQM_UNOW;
m_tag_prepend(m, mtag);
diff --git a/sys/netpfil/ipfw/dn_sched_fq_pie.c b/sys/netpfil/ipfw/dn_sched_fq_pie.c
index 2f61ca3de94e..c791ee333bc6 100644
--- a/sys/netpfil/ipfw/dn_sched_fq_pie.c
+++ b/sys/netpfil/ipfw/dn_sched_fq_pie.c
@@ -736,11 +736,11 @@ pie_enqueue(struct fq_pie_flow *q, struct mbuf* m, struct fq_pie_si *si)
mtag = m_tag_alloc(MTAG_ABI_COMPAT, DN_AQM_MTAG_TS,
sizeof(aqm_time_t), M_NOWAIT);
if (mtag == NULL) {
- m_freem(m);
t = DROP;
+ } else {
+ *(aqm_time_t *)(mtag + 1) = AQM_UNOW;
+ m_tag_prepend(m, mtag);
}
- *(aqm_time_t *)(mtag + 1) = AQM_UNOW;
- m_tag_prepend(m, mtag);
}
if (t != DROP) {