Merge 6.12-rc4 into usb-next

We need the USB fixes in here as well.

Greg Kroah-Hartman committed 2 years ago

Commit c6d9e432 parents 07b887f 42f7652476 files · +5101 −2741Browse files

Showing the changes to include/uapi (2 of 476 files). Show all

Unified · Split

2 files

@@ -6047,11 +6047,6 @@ enum { · 6046 unmodified lines
6047	6047	BPF_F_MARK_ENFORCE = (1ULL << 6),
6048	6048	};
6049	6049
6050		−/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
6051		−enum {
6052		− BPF_F_INGRESS = (1ULL << 0),
6053		−};
6054		−
6055	6050	/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
6056	6051	enum {
6057	6052	BPF_F_TUNINFO_IPV6 = (1ULL << 0),
@@ -6198,10 +6193,12 @@ enum { · 140 unmodified lines
6198	6193	BPF_F_BPRM_SECUREEXEC = (1ULL << 0),
6199	6194	};
6200	6195
6201		−/* Flags for bpf_redirect_map helper */
	6196	+/* Flags for bpf_redirect and bpf_redirect_map helpers */
6202	6197	enum {
6203		− BPF_F_BROADCAST = (1ULL << 3),
6204		− BPF_F_EXCLUDE_INGRESS = (1ULL << 4),
	6198	+ BPF_F_INGRESS = (1ULL << 0), /* used for skb path */
	6199	+ BPF_F_BROADCAST = (1ULL << 3), /* used for XDP path */
	6200	+ BPF_F_EXCLUDE_INGRESS = (1ULL << 4), /* used for XDP path */
	6201	+#define BPF_F_REDIRECT_FLAGS (BPF_F_INGRESS \| BPF_F_BROADCAST \| BPF_F_EXCLUDE_INGRESS)
6205	6202	};
6206	6203
6207	6204	#define __bpf_md_ptr(type, name) \

@@ -175,7 +175,13 @@ · 174 unmodified lines
175	175	/* use ioctl encoding for uring command */
176	176	#define UBLK_F_CMD_IOCTL_ENCODE (1UL << 6)
177	177
178		−/* Copy between request and user buffer by pread()/pwrite() */
	178	+/*
	179	+ * Copy between request and user buffer by pread()/pwrite()
	180	+ *
	181	+ * Not available for UBLK_F_UNPRIVILEGED_DEV, otherwise userspace may
	182	+ * deceive us by not filling request buffer, then kernel uninitialized
	183	+ * data may be leaked.
	184	+ */
179	185	#define UBLK_F_USER_COPY (1UL << 7)
180	186
181	187	/*

Keyboard shortcuts