summaryrefslogtreecommitdiffstats
path: root/patch-6.1-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-6.1-redhat.patch')
-rw-r--r--patch-6.1-redhat.patch22
1 files changed, 1 insertions, 21 deletions
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index db7dbf394..6eccac146 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -19,7 +19,6 @@
drivers/firmware/efi/Makefile | 1 +
drivers/firmware/efi/efi.c | 124 +++--
drivers/firmware/efi/secureboot.c | 38 ++
- drivers/gpu/drm/drm_ioctl.c | 8 +-
drivers/hid/hid-rmi.c | 64 ---
drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 +
drivers/input/rmi4/rmi_driver.c | 124 +++--
@@ -65,7 +64,7 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- 67 files changed, 1547 insertions(+), 188 deletions(-)
+ 66 files changed, 1540 insertions(+), 187 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index e92d63d3e878..28c0ab72ce28 100644
@@ -749,25 +748,6 @@ index 000000000000..de0a3714a5d4
+ }
+ }
+}
-diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
-index 8faad23dc1d8..ca2a6e6101dc 100644
---- a/drivers/gpu/drm/drm_ioctl.c
-+++ b/drivers/gpu/drm/drm_ioctl.c
-@@ -472,7 +472,13 @@ EXPORT_SYMBOL(drm_invalid_op);
- */
- static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
- {
-- int len;
-+ size_t len;
-+
-+ /* don't attempt to copy a NULL pointer */
-+ if (WARN_ONCE(!value, "BUG: the value to copy was not set!")) {
-+ *buf_len = 0;
-+ return 0;
-+ }
-
- /* don't overflow userbuf */
- len = strlen(value);
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index 311eee599ce9..2460c6bd46f8 100644
--- a/drivers/hid/hid-rmi.c