diff options
| author | csjp <csjp@FreeBSD.org> | 2008-08-27 23:52:03 +0000 |
|---|---|---|
| committer | csjp <csjp@FreeBSD.org> | 2008-08-27 23:52:03 +0000 |
| commit | d35aa3f0fd54420b55216744b6fb4e461ebe9ac5 (patch) | |
| tree | 7b851e7708944a85bcf10f4dfdbb811fbda67e41 /sys/netinet/ip_options.c | |
| parent | f8e575b9ca03a5a52cdf4506bbe489b25789bab6 (diff) | |
| download | FreeBSD-src-d35aa3f0fd54420b55216744b6fb4e461ebe9ac5.zip FreeBSD-src-d35aa3f0fd54420b55216744b6fb4e461ebe9ac5.tar.gz | |
Fix a panic in MAC kernels that was a result of un-initialized label
storage. We can safely remove the label copying operations since
M_MOVE_PKTHDR will move the mbuf tags (which contain MAC labels) to
the destination mbuf.
MFC after: 1 week
Discussed with: rwatson
Diffstat (limited to 'sys/netinet/ip_options.c')
| -rw-r--r-- | sys/netinet/ip_options.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c index b58dbee..df41c43 100644 --- a/sys/netinet/ip_options.c +++ b/sys/netinet/ip_options.c @@ -509,9 +509,6 @@ ip_insertoptions(struct mbuf *m, struct mbuf *opt, int *phlen) } M_MOVE_PKTHDR(n, m); n->m_pkthdr.rcvif = NULL; -#ifdef MAC - mac_mbuf_copy(m, n); -#endif n->m_pkthdr.len += optlen; m->m_len -= sizeof(struct ip); m->m_data += sizeof(struct ip); |
