Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

HID: cp2112: Use struct_group() for memcpy() region

In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memcpy(), memmove(), and memset(), avoid
intentionally writing across neighboring fields.

Use struct_group() in struct cp2112_string_report around members report,
length, type, and string, so they can be referenced together. This will
allow memcpy() and sizeof() to more easily reason about sizes, improve
readability, and avoid future warnings about writing beyond the end of
report.

"pahole" shows no size nor member offset changes to struct
cp2112_string_report. "objdump -d" shows no meaningful object
code changes (i.e. only source line number induced differences.)

Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: linux-input@vger.kernel.org
Acked-by: Jiri Kosina <jikos@kernel.org>
Link: https://lore.kernel.org/lkml/nycvar.YFH.7.76.2108201810560.15313@cbobk.fhfr.pm
Signed-off-by: Kees Cook <keescook@chromium.org>

+8 -6
+8 -6
drivers/hid/hid-cp2112.c
··· 129 129 130 130 struct cp2112_string_report { 131 131 u8 dummy; /* force .string to be aligned */ 132 - u8 report; /* CP2112_*_STRING */ 133 - u8 length; /* length in bytes of everyting after .report */ 134 - u8 type; /* USB_DT_STRING */ 135 - wchar_t string[30]; /* UTF16_LITTLE_ENDIAN string */ 132 + struct_group_attr(contents, __packed, 133 + u8 report; /* CP2112_*_STRING */ 134 + u8 length; /* length in bytes of everything after .report */ 135 + u8 type; /* USB_DT_STRING */ 136 + wchar_t string[30]; /* UTF16_LITTLE_ENDIAN string */ 137 + ); 136 138 } __packed; 137 139 138 140 /* Number of times to request transfer status before giving up waiting for a ··· 988 986 u8 length; 989 987 int ret; 990 988 991 - ret = cp2112_hid_get(hdev, attr->report, &report.report, 992 - sizeof(report) - 1, HID_FEATURE_REPORT); 989 + ret = cp2112_hid_get(hdev, attr->report, (u8 *)&report.contents, 990 + sizeof(report.contents), HID_FEATURE_REPORT); 993 991 if (ret < 3) { 994 992 hid_err(hdev, "error reading %s string: %d\n", kattr->attr.name, 995 993 ret);