Copy flags over ifr_union directly rather than via casts through ifr_data.
ClosedPublic
Actions

Authored by brooks on Mar 27 2018, 7:04 PM.

Details

Reviewers

kib
emaste
jhb

Commits

rS332161: MFC r331651-r331653
rS331653: Copy flags over ifr_union directly rather than via casts through ifr_data.

Summary

No functional change. If the sbni driver supported 64-bit big-endian
system, this would be an ABI changes, but it is i386-only. The old version
also leaked a word of stack on 64-bit systems.

This eliminates the only assignment to ifr_data.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

brooks created this revision.Mar 27 2018, 7:04 PM

Harbormaster completed remote builds in B15835: Diff 40816.Mar 27 2018, 7:04 PM

An alternative approach might be to add an char ifru_bytes[sizeof(struct sockaddr)] to ifreq's union and target that.

kib accepted this revision.Mar 27 2018, 8:23 PM

kib added inline comments.

sys/dev/sbni/if_sbni.c
1147 ↗	(On Diff #40816)	I think this leaks a word of stack on 64bit machines.

This revision is now accepted and ready to land.Mar 27 2018, 8:23 PM

brooks added inline comments.Mar 27 2018, 8:26 PM

sys/dev/sbni/if_sbni.c
1147 ↗	(On Diff #40816)	ioctl handles this for us because it copied in the whole ifreq in sys_ioctl().

brooks added inline comments.Mar 27 2018, 9:00 PM

sys/dev/sbni/if_sbni.c
1147 ↗	(On Diff #40816)	No, you are right. The old one does.

brooks edited the summary of this revision. (Show Details)Mar 27 2018, 9:01 PM

Closed by commit rS331653: Copy flags over ifr_union directly rather than via casts through ifr_data. (authored by brooks). · Explain WhyMar 27 2018, 9:06 PM

This revision was automatically updated to reflect the committed changes.

Herald added a subscriber: imp. · View Herald TranscriptMar 27 2018, 9:06 PM

Revision Contents
Changeset List

Path

Size

head/

sys/

dev/

sbni/

if_sbni.c

4 lines

Diff 40822

View Options

head/sys/dev/sbni/if_sbni.c

Copy flags over ifr_union directly rather than via casts through ifr_data.ClosedPublicActions