Attachment 255223 Details for Bug 282790 – Patch to uhid.c correcting the defect.

[patch] Patch to uhid.c correcting the defect.

uhid.patch (text/plain), 1.53 KB, created by Matthew.Nygard.Dodd on 2024-11-16 19:36:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew.Nygard.Dodd

Created: 2024-11-16 19:36:55 UTC

Size: 1.53 KB

patch

obsolete

>diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c
>index 863e04f4e52b..4e707b4aec60 100644
>--- a/sys/dev/usb/input/uhid.c
>+++ b/sys/dev/usb/input/uhid.c
>@@ -611,60 +611,61 @@ uhid_ioctl(struct usb_fifo *fifo, u_long cmd, void *addr,
> 			mtx_unlock(&sc->sc_mtx);
> 		}
> 		break;
> 
> 	case USB_GET_REPORT:
> 		if (!(fflags & FREAD)) {
> 			error = EPERM;
> 			break;
> 		}
> 		switch (ugd->ugd_report_type) {
> 		case UHID_INPUT_REPORT:
> 			size = sc->sc_isize;
> 			id = sc->sc_iid;
> 			break;
> 		case UHID_OUTPUT_REPORT:
> 			size = sc->sc_osize;
> 			id = sc->sc_oid;
> 			break;
> 		case UHID_FEATURE_REPORT:
> 			size = sc->sc_fsize;
> 			id = sc->sc_fid;
> 			break;
> 		default:
> 			return (EINVAL);
> 		}
> 		if (id != 0)
> 			error = copyin(ugd->ugd_data, &id, 1);
> 		if (error == 0)
> 			error = uhid_get_report(sc, ugd->ugd_report_type, id,
> 			    NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size));
>+		ugd->ugd_actlen = size;
> 		break;
> 
> 	case USB_SET_REPORT:
> 		if (!(fflags & FWRITE)) {
> 			error = EPERM;
> 			break;
> 		}
> 		switch (ugd->ugd_report_type) {
> 		case UHID_INPUT_REPORT:
> 			size = sc->sc_isize;
> 			id = sc->sc_iid;
> 			break;
> 		case UHID_OUTPUT_REPORT:
> 			size = sc->sc_osize;
> 			id = sc->sc_oid;
> 			break;
> 		case UHID_FEATURE_REPORT:
> 			size = sc->sc_fsize;
> 			id = sc->sc_fid;
> 			break;
> 		default:
> 			return (EINVAL);
> 		}
> 		if (id != 0)
> 			error = copyin(ugd->ugd_data, &id, 1);
> 		if (error == 0)
> 			error = uhid_set_report(sc, ugd->ugd_report_type, id,
> 			    NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size));
> 		break;
>

Actions: View | Diff

Attachments on bug 282790: 255207 | 255223 | 255239