mirror of
https://github.com/torvalds/linux
synced 2024-09-06 09:51:23 +00:00
hardening fixes for v6.5-rc6
- Replace remaining open-coded struct_size_t() instance (Gustavo A. R. Silva) - Adjust vboxsf's trailing arrays to be proper flexible arrays -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEEpcP2jyKd1g9yPm4TiXL039xtwCYFAmTSsEsWHGtlZXNjb29r QGNocm9taXVtLm9yZwAKCRCJcvTf3G3AJq/SD/9FoTOWtY9BWH5txtn7BUpVpJII 884X+hMhT2oNWSgeuGT4edz6+J8v2BwtWg9TWRLyGGlLXnGfXK1Z8/ARKRadwoQ7 87HHWHx7Kld1z3duGdkHSpsq/OwZ2QQP0e2cmnhXKSajxKJZdjVHNwERAwNEHlXM IFfaNocCPGXhWx/i3bYR7jU4378pBtDDJ2TRsfyjITmgSz77S4x+hG/QYtmK+EjO 9OdcnVML4GbG+7hMmtbM2Q59av7OoHJkP4brJg1Nc4XnuIB0fl6oFxWzFMgO9G5g hQPv7xiy3QQwTYG6HGUKvyjSQGNfUE3Qbth+6XuREwOoS0WGlmzkvIxkKPisoFb8 lyz46wJOCVmD4pN0YvVy8v/NMMJXOU26+Udwu1DnQADSBdNsdQqJPM29o1GwKX7z L3Et4btriCQhG49EmMdokzPxXEBCFCa5V2UQVHA2Gx2CpYpcIim4YL9oEobqSzdK aHwt1zwEooSLcyzJDxjb6PV5ej+OWVSqfTCX92fw+GHAUnZ/NbD1GuLADPSxcx+A uRXLD+eBMM0OdTwEqpUSt9G1WNBDgJo/IOjtmOJOGYUsN+MPj/HdtO0rewGNkGpy ib4NNbHlIuLJNplESNsuW6tpZkg4PcGC88koIQkBOE6YWfAWbZggeCiM1vGlFcoR xTdlCTdhtYzsqxSv5g== =285v -----END PGP SIGNATURE----- Merge tag 'hardening-v6.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux Pull hardening fixes from Kees Cook: - Replace remaining open-coded struct_size_t() instance (Gustavo A. R. Silva) - Adjust vboxsf's trailing arrays to be proper flexible arrays * tag 'hardening-v6.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: media: venus: Use struct_size_t() helper in pkt_session_unset_buffers() vboxsf: Use flexible arrays for trailing string member
This commit is contained in:
commit
13b9372068
|
@ -251,8 +251,8 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt,
|
|||
|
||||
pkt->extradata_size = 0;
|
||||
pkt->shdr.hdr.size =
|
||||
struct_size((struct hfi_session_set_buffers_pkt *)0,
|
||||
buffer_info, bd->num_buffers);
|
||||
struct_size_t(struct hfi_session_set_buffers_pkt,
|
||||
buffer_info, bd->num_buffers);
|
||||
}
|
||||
|
||||
pkt->response_req = bd->response_required;
|
||||
|
|
|
@ -68,9 +68,9 @@ struct shfl_string {
|
|||
|
||||
/** UTF-8 or UTF-16 string. Nul terminated. */
|
||||
union {
|
||||
u8 utf8[2];
|
||||
u16 utf16[1];
|
||||
u16 ucs2[1]; /* misnomer, use utf16. */
|
||||
u8 legacy_padding[2];
|
||||
DECLARE_FLEX_ARRAY(u8, utf8);
|
||||
DECLARE_FLEX_ARRAY(u16, utf16);
|
||||
} string;
|
||||
};
|
||||
VMMDEV_ASSERT_SIZE(shfl_string, 6);
|
||||
|
|
Loading…
Reference in a new issue