upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-29 18:32:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

hidraw: Return string lengths for certain ioctls

Browse source 
Make HIDIOCGRAWPHYS, HIDIOCGRAWNAME, and HIDIOCGRAWUNIQ return
the length of the copied out string (including the trailing NUL
character), so they behave like their Linux hidraw counterparts.

Reviewed by:	wulf
Differential Revision:	https://reviews.freebsd.org/D35233
This commit is contained in:
Michael Gmelin 2022-05-17 11:37:21 +02:00
parent f8f1e9cd1c
commit ed87ff4e95
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sys/dev/hid/hidraw.c
View file

@ -569,6 +569,7 @@ hidraw_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
struct hidraw_gen_descriptor *hgd;
struct hidraw_report_descriptor *hrd;
struct hidraw_devinfo *hdi;
const char *devname;
uint32_t size;
int id, len;
int error = 0;
@ -825,10 +826,13 @@ hidraw_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
switch (IOCBASECMD(cmd)) {
case HIDIOCGRAWNAME(0):
strlcpy(addr, sc->sc_hw->name, len);
td->td_retval[0] = min(strlen(sc->sc_hw->name) + 1, len);
return (0);
case HIDIOCGRAWPHYS(0):
strlcpy(addr, device_get_nameunit(sc->sc_dev), len);
devname = device_get_nameunit(sc->sc_dev);
strlcpy(addr, devname, len);
td->td_retval[0] = min(strlen(devname) + 1, len);
return (0);
case HIDIOCSFEATURE(0):
@ -859,6 +863,7 @@ hidraw_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
case HIDIOCGRAWUNIQ(0):
strlcpy(addr, sc->sc_hw->serial, len);
td->td_retval[0] = min(strlen(sc->sc_hw->serial) + 1, len);
return (0);
}