talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure that rbuf is aligned by making a union w/ the structure we 

need to access...  access the struct through the union too...

PR:		185165
Submitted by:	Guy Yur
MFC after:	1 week
This commit is contained in:
John-Mark Gurney 2014-01-07 23:01:05 +00:00
parent 0f25d857e0
commit 4e5422a9e6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libnetgraph/sock.c
View File

@ -111,9 +111,12 @@ gotNode:
/* Save node name */
strlcpy(namebuf, name, sizeof(namebuf));
} else if (dsp != NULL) {
u_char rbuf[sizeof(struct ng_mesg) + sizeof(struct nodeinfo)];
struct ng_mesg *const resp = (struct ng_mesg *) rbuf;
struct nodeinfo *const ni = (struct nodeinfo *) resp->data;
union {
u_char rbuf[sizeof(struct ng_mesg) +
sizeof(struct nodeinfo)];
struct ng_mesg res;
} res;
struct nodeinfo *const ni = (struct nodeinfo *) res.res.data;
/* Find out the node ID */
if (NgSendMsg(cs, ".", NGM_GENERIC_COOKIE,
@ -123,7 +126,7 @@ gotNode:
NGLOG("send nodeinfo");
goto errout;
}
if (NgRecvMsg(cs, resp, sizeof(rbuf), NULL) < 0) {
if (NgRecvMsg(cs, &res.res, sizeof(res.rbuf), NULL) < 0) {
errnosv = errno;
if (_gNgDebugLevel >= 1)
NGLOG("recv nodeinfo");