diff options
| author | sam <sam@FreeBSD.org> | 2002-12-30 20:22:40 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2002-12-30 20:22:40 +0000 |
| commit | b16cb0a948acd6a3b5f47aa494607a001944c194 (patch) | |
| tree | 984c2041a8941be016b4cab972816b51adcc818d /sys/dev/ubsec | |
| parent | 83fcaa45a1be401bd2ecafa45dbfb492a71532b7 (diff) | |
| download | FreeBSD-src-b16cb0a948acd6a3b5f47aa494607a001944c194.zip FreeBSD-src-b16cb0a948acd6a3b5f47aa494607a001944c194.tar.gz | |
Correct mbuf packet header propagation. Previously, packet headers
were sometimes propagated using M_COPY_PKTHDR which actually did
something between a "move" and a "copy" operation. This is replaced
by M_MOVE_PKTHDR (which copies the pkthdr contents and "removes" it
from the source mbuf) and m_dup_pkthdr which copies the packet
header contents including any m_tag chain. This corrects numerous
problems whereby mbuf tags could be lost during packet manipulations.
These changes also introduce arguments to m_tag_copy and m_tag_copy_chain
to specify if the tag copy work should potentially block. This
introduces an incompatibility with openbsd which we may want to revisit.
Note that move/dup of packet headers does not handle target mbufs
that have a cluster bound to them. We may want to support this;
for now we watch for it with an assert.
Finally, M_COPYFLAGS was updated to include M_FIRSTFRAG|M_LASTFRAG.
Supported by: Vernier Networks
Reviewed by: Robert Watson <rwatson@FreeBSD.org>
Diffstat (limited to 'sys/dev/ubsec')
| -rw-r--r-- | sys/dev/ubsec/ubsec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c index 37cb37e..b62a425 100644 --- a/sys/dev/ubsec/ubsec.c +++ b/sys/dev/ubsec/ubsec.c @@ -1269,6 +1269,10 @@ ubsec_process(void *arg, struct cryptop *crp, int hint) if (q->q_src_m->m_flags & M_PKTHDR) { len = MHLEN; MGETHDR(m, M_DONTWAIT, MT_DATA); + if (m && !m_dup_pkthdr(m, q->q_src_m, M_DONTWAIT)) { + m_free(m); + m = NULL; + } } else { len = MLEN; MGET(m, M_DONTWAIT, MT_DATA); @@ -1278,8 +1282,6 @@ ubsec_process(void *arg, struct cryptop *crp, int hint) err = sc->sc_nqueue ? ERESTART : ENOMEM; goto errout; } - if (len == MHLEN) - M_COPY_PKTHDR(m, q->q_src_m); if (totlen >= MINCLSIZE) { MCLGET(m, M_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { |
