History

Merge tag 'hardening-v6.5-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull hardening fixes from Kees Cook: - Check for NULL bdev in LoadPin (Matthias Kaehlcke) - Revert unwanted KUnit FORTIFY build default - Fix 1-element array causing boot warnings with xhci-hub * tag 'hardening-v6.5-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: usb: ch9: Replace bmSublinkSpeedAttr 1-element array with flexible array Revert "fortify: Allow KUnit test to build without FORTIFY" dm: verity-loadpin: Add NULL pointer check for 'bdev' parameter

Linus Torvalds committed 3 years ago

Commit 8fc3b8f2 parents c206353 01f23c54 files · +9 −16Browse files

Showing the changes to include/uapi/linux (1 of 4 files). Show all

Unified · Split

include/uapi/linux/usb/ch9.h+5−1
@@ -984,7 +984,11 @@ struct usb_ssp_cap_descriptor { · 983 unmodified lines
984984 #define USB_SSP_MIN_RX_LANE_COUNT (0xf << 8)
985985 #define USB_SSP_MIN_TX_LANE_COUNT (0xf << 12)
986986 __le16 wReserved;
987− __le32 bmSublinkSpeedAttr[1]; /* list of sublink speed attrib entries */
987+ union {
988+ __le32 legacy_padding;
989+ /* list of sublink speed attrib entries */
990+ __DECLARE_FLEX_ARRAY(__le32, bmSublinkSpeedAttr);
991+ };
988992 #define USB_SSP_SUBLINK_SPEED_SSID (0xf) /* sublink speed ID */
989993 #define USB_SSP_SUBLINK_SPEED_LSE (0x3 << 4) /* Lanespeed exponent */
990994 #define USB_SSP_SUBLINK_SPEED_LSE_BPS 0