d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

genet: fix output packet corruption in uncommon case

Browse Source 
The code for the "shift" block in the COPY macro set the pointer for
the next copy block to the wrong value.  In this case, the link-layer
header would be overwritten by the network-layer header.  This case is
difficult or impossible to exercise in the current driver without
changing the value of the hw.genet.tx_hdr_min sysctl.  Correct the
pointer.  While here, remove a line in the macro that was marked
"unneeded", which was actually wrong.

PR:		263824
Submitted by:	jiahali@blackberry.com
MFC after:	2 weeks
This commit is contained in:
Mike Karels 2022-05-09 07:19:52 -05:00
parent dc484aed0a
commit 1de9aa4d4f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arm64/broadcom/genet/if_genet.c
View File

@ -1254,11 +1254,10 @@ gen_parse_tx(struct mbuf *m, int csum_flags)
m0->m_data = m0->m_pktdat; \
bcopy(p0, mtodo(m0, sizeof(struct statusblock)),\
m0->m_len - sizeof(struct statusblock)); \
copy_p = mtodo(m0, sizeof(struct statusblock)); \
copy_p = mtodo(m0, m0->m_len); \
} \
bcopy(p, copy_p, hsize); \
m0->m_len += hsize; \
m0->m_pkthdr.len += hsize; /* unneeded */ \
m->m_len -= hsize; \
m->m_data += hsize; \
} \