Merge tag 'ASB-2024-12-05_4.19-stable' of https://android.googlesource.com/kernel/common into android13-4.19-kona
https://source.android.com/docs/security/bulletin/2024-12-01 * tag 'ASB-2024-12-05_4.19-stable' of https://android.googlesource.com/kernel/common: (401 commits) Linux 4.19.324 9p: fix slab cache name creation for real net: usb: qmi_wwan: add Fibocom FG132 0x0112 composition fs: Fix uninitialized value issue in from_kuid and from_kgid powerpc/powernv: Free name on error in opal_event_init() sound: Make CONFIG_SND depend on INDIRECT_IOMEM instead of UML bpf: use kvzmalloc to allocate BPF verifier environment HID: multitouch: Add quirk for HONOR MagicBook Art 14 touchpad 9p: Avoid creating multiple slab caches with the same name ALSA: usb-audio: Add endianness annotations vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans hv_sock: Initializing vsk->trans to NULL to prevent a dangling pointer ALSA: usb-audio: Add quirks for Dell WD19 dock ALSA: usb-audio: Support jack detection on Dell dock ALSA: usb-audio: Add custom mixer status quirks for RME CC devices ALSA: pcm: Return 0 when size < start_threshold in capture ocfs2: remove entry once instead of null-ptr-dereference in ocfs2_xa_remove() irqchip/gic-v3: Force propagation of the active state with a read-back USB: serial: option: add Quectel RG650V USB: serial: option: add Fibocom FG132 0x0112 composition ... Conflicts: drivers/usb/dwc3/core.c drivers/usb/dwc3/core.h net/qrtr/qrtr.c Change-Id: I328847813eb875d25c4aa35dcc7ba58ad09b53ae
This commit is contained in:
@@ -132,6 +132,8 @@ static inline void cec_msg_init(struct cec_msg *msg,
|
||||
* Set the msg destination to the orig initiator and the msg initiator to the
|
||||
* orig destination. Note that msg and orig may be the same pointer, in which
|
||||
* case the change is done in place.
|
||||
*
|
||||
* It also zeroes the reply, timeout and flags fields.
|
||||
*/
|
||||
static inline void cec_msg_set_reply_to(struct cec_msg *msg,
|
||||
struct cec_msg *orig)
|
||||
@@ -139,7 +141,9 @@ static inline void cec_msg_set_reply_to(struct cec_msg *msg,
|
||||
/* The destination becomes the initiator and vice versa */
|
||||
msg->msg[0] = (cec_msg_destination(orig) << 4) |
|
||||
cec_msg_initiator(orig);
|
||||
msg->reply = msg->timeout = 0;
|
||||
msg->reply = 0;
|
||||
msg->timeout = 0;
|
||||
msg->flags = 0;
|
||||
}
|
||||
|
||||
/* cec_msg flags field */
|
||||
|
||||
@@ -1464,7 +1464,7 @@ enum nft_object_attributes {
|
||||
*
|
||||
* @NFTA_FLOWTABLE_TABLE: name of the table containing the expression (NLA_STRING)
|
||||
* @NFTA_FLOWTABLE_NAME: name of this flow table (NLA_STRING)
|
||||
* @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32)
|
||||
* @NFTA_FLOWTABLE_HOOK: netfilter hook configuration (NLA_NESTED)
|
||||
* @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32)
|
||||
* @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64)
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user