Move 32-bit compat support for CDIOREADTOCENTRYS to the right place.
ClosedPublic
Actions

Authored by brooks on Oct 1 2018, 6:08 PM.

Details

Reviewers

kib
jhb
emaste

Summary

ioctl(2) commands only have meaning in the context of a file descriptor
so translating them in the syscall layer is incorrect.

The new handler users an accessor to retrieve/construct a pointer from
the last member of the passed structure and relies on type punning to
access the other members which require no translation.

Obtained from: CheriBSD
Sponsored by: DARPA, AFRL

Diff Detail

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 19900
Build 19423: arc lint + arc unit

Event Timeline

brooks created this revision.Oct 1 2018, 6:08 PM

Harbormaster completed remote builds in B19896: Diff 48627.Oct 1 2018, 6:08 PM

This seems to work, but the previous 'sincere' copy is better, IMO.

This revision is now accepted and ready to land.Oct 1 2018, 6:32 PM

jhb added inline comments.Oct 1 2018, 6:45 PM

sys/cam/scsi/scsi_cd.c
1299	In some ways it'd be nicer if this used the ioctl command itself rather than SV_CURPROC_FLAG to decide this as it's really the ioctl command value that determines the layout of the structure.

Pass cmd to te_data_get_ptr and switch on the size rather than SV_ILP32.

This revision now requires review to proceed.Oct 1 2018, 10:07 PM

Harbormaster completed remote builds in B19899: Diff 48636.Oct 1 2018, 10:07 PM

brooks marked 2 inline comments as done.Oct 1 2018, 10:08 PM

brooks added inline comments.

sys/cam/scsi/scsi_cd.c
1299	I've alter the code to switch on the size embedded in the command. I'm using the size rather than the command it self because using the command isn't a scalable pattern for structs used by many ioctls.