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

This patch fixes thread unsafe usage of global pkt_hdr

Browse Source 
variable. Second part is not so important, but IMO is also good.

Approved by:	re (kensmith), glebius (mentor)
This commit is contained in:
Alexander Motin 2007-09-21 08:16:33 +00:00
parent 258853ab1c
commit 1e7d84b055
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=172269
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sys/netgraph/ng_pppoe.c
View File

@ -1552,15 +1552,14 @@ ng_pppoe_rcvdata(hook_p hook, item_p item)
/*
* Bang in a pre-made header, and set the length up
* to be correct. Then send it to the ethernet driver.
* But first correct the length.
*/
sp->pkt_hdr.ph.length = htons((short)(m->m_pkthdr.len));
M_PREPEND(m, sizeof(*wh), M_DONTWAIT);
if (m == NULL)
LEAVE(ENOBUFS);
wh = mtod(m, struct pppoe_full_hdr *);
bcopy(&sp->pkt_hdr, wh, sizeof(*wh));
wh->ph.length = htons(m->m_pkthdr.len - sizeof(*wh));
NG_FWD_NEW_DATA( error, item, privp->ethernet_hook, m);
privp->packets_out++;
break;
@ -1702,23 +1701,6 @@ ng_pppoe_disconnect(hook_p hook)
&& ((sp->state == PPPOE_CONNECTED)
|| (sp->state == PPPOE_NEWCONNECTED))) {
struct mbuf *m;
struct pppoe_full_hdr *wh;
struct pppoe_tag *tag;
int msglen = strlen(SIGNOFF);
int error = 0;
/* Revert the stored header to DISC/PADT mode. */
wh = &sp->pkt_hdr;
wh->ph.code = PADT_CODE;
/*
* Configure ethertype depending on what was used
* during sessions stage.
*/
if (sp->pkt_hdr.eh.ether_type ==
ETHERTYPE_PPPOE_3COM_SESS)
wh->eh.ether_type = ETHERTYPE_PPPOE_3COM_DISC;
else
wh->eh.ether_type = ETHERTYPE_PPPOE_DISC;
/* Generate a packet of that type. */
MGETHDR(m, M_DONTWAIT, MT_DATA);
@ -1726,15 +1708,31 @@ ng_pppoe_disconnect(hook_p hook)
log(LOG_NOTICE, "ng_pppoe[%x]: session out of "
"mbufs\n", node->nd_ID);
else {
struct pppoe_full_hdr *wh;
struct pppoe_tag *tag;
int msglen = strlen(SIGNOFF);
int error = 0;
m->m_pkthdr.rcvif = NULL;
m->m_pkthdr.len = m->m_len = sizeof(*wh);
bcopy((caddr_t)wh, mtod(m, caddr_t),
sizeof(*wh));
wh = mtod(m, struct pppoe_full_hdr *);
bcopy(&sp->pkt_hdr, wh, sizeof(*wh));
/* Revert the stored header to DISC/PADT mode. */
wh->ph.code = PADT_CODE;
/*
* Configure ethertype depending on what
* was used during sessions stage.
*/
if (wh->eh.ether_type ==
ETHERTYPE_PPPOE_3COM_SESS)
wh->eh.ether_type = ETHERTYPE_PPPOE_3COM_DISC;
else
wh->eh.ether_type = ETHERTYPE_PPPOE_DISC;
/*
* Add a General error message and adjust
* sizes.
*/
wh = mtod(m, struct pppoe_full_hdr *);
tag = wh->ph.tag;
tag->tag_type = PTT_GEN_ERR;
tag->tag_len = htons((u_int16_t)msglen);