diff options
| -rw-r--r-- | 0001-USB-gadget-dummy_hcd-switch-char-to-u8.patch | 4 | ||||
| -rw-r--r-- | 0001-driver-core-add-printk-debugging.patch | 14 | ||||
| -rw-r--r-- | 0001-driver-core-aux-test-code.patch | 21 | ||||
| -rw-r--r-- | 0001-misc-convert-to-guards.patch | 88 | ||||
| -rw-r--r-- | 0001-readfile-implement-readfile-syscall.patch | 2 | ||||
| -rw-r--r-- | 0001-vsmp-driver.patch | 4 | ||||
| -rw-r--r-- | 0002-arch-wire-up-the-readfile-syscall.patch | 210 | ||||
| -rw-r--r-- | 0003-selftests-add-readfile-2-selftests.patch | 16 | ||||
| -rw-r--r-- | qlcnic_sysfs.patch | 6 | ||||
| -rw-r--r-- | spdxcheck-print-out-files-without-any-spdx-lines.patch | 2 | ||||
| -rw-r--r-- | usb.patch | 2 |
11 files changed, 145 insertions, 224 deletions
diff --git a/0001-USB-gadget-dummy_hcd-switch-char-to-u8.patch b/0001-USB-gadget-dummy_hcd-switch-char-to-u8.patch index ee75c4e107d866..d64aa80ba29433 100644 --- a/0001-USB-gadget-dummy_hcd-switch-char-to-u8.patch +++ b/0001-USB-gadget-dummy_hcd-switch-char-to-u8.patch @@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/usb/gadget/udc/dummy_hcd.c +++ b/drivers/usb/gadget/udc/dummy_hcd.c -@@ -1741,13 +1741,13 @@ static int handle_control_request(struct +@@ -1747,13 +1747,13 @@ static int handle_control_request(struct if (setup->bRequestType == Dev_InRequest || setup->bRequestType == Intf_InRequest || setup->bRequestType == Ep_InRequest) { @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> if (urb->transfer_buffer_length > 0) { if (setup->bRequestType == Ep_InRequest) { ep2 = find_endpoint(dum, w_index); -@@ -1756,11 +1756,12 @@ static int handle_control_request(struct +@@ -1762,11 +1762,12 @@ static int handle_control_request(struct break; } buf[0] = ep2->halted; diff --git a/0001-driver-core-add-printk-debugging.patch b/0001-driver-core-add-printk-debugging.patch index 69bba41edede01..1f45794aefd3ea 100644 --- a/0001-driver-core-add-printk-debugging.patch +++ b/0001-driver-core-add-printk-debugging.patch @@ -13,7 +13,7 @@ Helps when trying to find leaks --- a/drivers/base/bus.c +++ b/drivers/base/bus.c -@@ -208,6 +208,7 @@ static void bus_release(struct kobject * +@@ -210,6 +210,7 @@ static void bus_release(struct kobject * struct subsys_private *priv = to_subsys_private(kobj); lockdep_unregister_key(&priv->lock_key); @@ -21,7 +21,7 @@ Helps when trying to find leaks kfree(priv); } -@@ -1198,6 +1199,7 @@ EXPORT_SYMBOL_GPL(subsys_interface_unreg +@@ -1205,6 +1206,7 @@ EXPORT_SYMBOL_GPL(subsys_interface_unreg static void system_root_device_release(struct device *dev) { @@ -40,7 +40,7 @@ Helps when trying to find leaks #include <linux/device/class.h> #include <linux/device.h> #include <linux/module.h> -@@ -574,6 +576,7 @@ EXPORT_SYMBOL_GPL(class_compat_register) +@@ -591,6 +593,7 @@ EXPORT_SYMBOL_GPL(class_compat_register) */ void class_compat_unregister(struct class_compat *cls) { @@ -50,7 +50,7 @@ Helps when trying to find leaks } --- a/drivers/base/core.c +++ b/drivers/base/core.c -@@ -3948,6 +3948,7 @@ EXPORT_SYMBOL_GPL(device_del); +@@ -3919,6 +3919,7 @@ EXPORT_SYMBOL_GPL(device_del); void device_unregister(struct device *dev) { pr_debug("device: '%s': %s\n", dev_name(dev), __func__); @@ -58,7 +58,7 @@ Helps when trying to find leaks device_del(dev); put_device(dev); } -@@ -4377,6 +4378,7 @@ EXPORT_SYMBOL_GPL(root_device_unregister +@@ -4338,6 +4339,7 @@ EXPORT_SYMBOL_GPL(root_device_unregister static void device_create_release(struct device *dev) { pr_debug("device: '%s': %s\n", dev_name(dev), __func__); @@ -66,7 +66,7 @@ Helps when trying to find leaks kfree(dev); } -@@ -4511,6 +4513,7 @@ void device_destroy(const struct class * +@@ -4472,6 +4474,7 @@ void device_destroy(const struct class * dev = class_find_device_by_devt(class, devt); if (dev) { @@ -76,7 +76,7 @@ Helps when trying to find leaks } --- a/drivers/usb/core/endpoint.c +++ b/drivers/usb/core/endpoint.c -@@ -138,6 +138,7 @@ static void ep_device_release(struct dev +@@ -139,6 +139,7 @@ static void ep_device_release(struct dev { struct ep_device *ep_dev = to_ep_device(dev); diff --git a/0001-driver-core-aux-test-code.patch b/0001-driver-core-aux-test-code.patch index cda132cdcfb352..3c16306af3ddd0 100644 --- a/0001-driver-core-aux-test-code.patch +++ b/0001-driver-core-aux-test-code.patch @@ -5,11 +5,10 @@ Subject: [PATCH] driver core: aux test code try to test out the aux bus code --- - drivers/base/Kconfig | 2 - drivers/base/Makefile | 1 - drivers/base/aux_test.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ - drivers/base/auxiliary.c | 1 - 4 files changed, 143 insertions(+), 1 deletion(-) + drivers/base/Kconfig | 2 + drivers/base/Makefile | 1 + drivers/base/aux_test.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 drivers/base/aux_test.c --- a/drivers/base/Kconfig @@ -27,7 +26,7 @@ try to test out the aux bus code +++ b/drivers/base/Makefile @@ -8,6 +8,7 @@ obj-y := component.o core.o bus.o dd.o topology.o container.o property.o cacheinfo.o \ - swnode.o + swnode.o faux.o obj-$(CONFIG_AUXILIARY_BUS) += auxiliary.o +obj-$(CONFIG_AUXILIARY_BUS) += aux_test.o obj-$(CONFIG_DEVTMPFS) += devtmpfs.o @@ -176,13 +175,3 @@ try to test out the aux bus code + + +MODULE_LICENSE("GPL v2"); ---- a/drivers/base/auxiliary.c -+++ b/drivers/base/auxiliary.c -@@ -11,6 +11,7 @@ - #include <linux/init.h> - #include <linux/slab.h> - #include <linux/module.h> -+#include <linux/slab.h> - #include <linux/pm_domain.h> - #include <linux/pm_runtime.h> - #include <linux/string.h> diff --git a/0001-misc-convert-to-guards.patch b/0001-misc-convert-to-guards.patch index be8763cca4551d..a5ca0804a9aaca 100644 --- a/0001-misc-convert-to-guards.patch +++ b/0001-misc-convert-to-guards.patch @@ -4,14 +4,12 @@ Date: Mon, 12 Jun 2023 17:34:02 +0200 Subject: [PATCH] misc: convert to guards --- - drivers/char/misc.c | 69 +++++++++++++++++---------------------------- - 1 file changed, 26 insertions(+), 43 deletions(-) + drivers/char/misc.c | 44 +++++++++++++++----------------------------- + 1 file changed, 15 insertions(+), 29 deletions(-) -diff --git a/drivers/char/misc.c b/drivers/char/misc.c -index 1c44c29a666e..9b0418a3dc0d 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c -@@ -123,10 +123,9 @@ static int misc_open(struct inode *inode, struct file *file) +@@ -137,10 +137,9 @@ static int misc_open(struct inode *inode { int minor = iminor(inode); struct miscdevice *c = NULL, *iter; @@ -23,7 +21,7 @@ index 1c44c29a666e..9b0418a3dc0d 100644 list_for_each_entry(iter, &misc_list, list) { if (iter->minor != minor) -@@ -149,7 +148,7 @@ static int misc_open(struct inode *inode, struct file *file) +@@ -163,7 +162,7 @@ static int misc_open(struct inode *inode break; } if (!new_fops) @@ -32,7 +30,7 @@ index 1c44c29a666e..9b0418a3dc0d 100644 } /* -@@ -159,13 +158,11 @@ static int misc_open(struct inode *inode, struct file *file) +@@ -173,13 +172,11 @@ static int misc_open(struct inode *inode */ file->private_data = c; @@ -48,8 +46,8 @@ index 1c44c29a666e..9b0418a3dc0d 100644 + return 0; } - static struct class *misc_class; -@@ -197,29 +194,24 @@ static const struct file_operations misc_fops = { + static char *misc_devnode(const struct device *dev, umode_t *mode) +@@ -225,37 +222,30 @@ static const struct file_operations misc int misc_register(struct miscdevice *misc) { dev_t dev; @@ -62,17 +60,18 @@ index 1c44c29a666e..9b0418a3dc0d 100644 + guard(mutex)(&misc_mtx); if (is_dynamic) { - int i = misc_minor_alloc(); + int i = misc_minor_alloc(misc->minor); ++ if (i < 0) ++ return -EBUSY; - if (i < 0) { - err = -EBUSY; - goto out; - } -+ if (i < 0) -+ return -EBUSY; misc->minor = i; } else { struct miscdevice *c; + int i; list_for_each_entry(c, &misc_list, list) { - if (c->minor == misc->minor) { @@ -82,10 +81,19 @@ index 1c44c29a666e..9b0418a3dc0d 100644 + if (c->minor == misc->minor) + return -EBUSY; } + + i = misc_minor_alloc(misc->minor); +- if (i < 0) { +- err = -EBUSY; +- goto out; +- } ++ if (i < 0) ++ return -EBUSY; } -@@ -233,8 +225,7 @@ int misc_register(struct miscdevice *misc) - misc_minor_free(misc->minor); + dev = MKDEV(MISC_MAJOR, misc->minor); +@@ -268,8 +258,7 @@ int misc_register(struct miscdevice *mis + if (is_dynamic) { misc->minor = MISC_DYNAMIC_MINOR; } - err = PTR_ERR(misc->this_device); @@ -94,7 +102,7 @@ index 1c44c29a666e..9b0418a3dc0d 100644 } /* -@@ -242,9 +233,7 @@ int misc_register(struct miscdevice *misc) +@@ -277,9 +266,7 @@ int misc_register(struct miscdevice *mis * earlier defaults */ list_add(&misc->list, &misc_list); @@ -105,62 +113,16 @@ index 1c44c29a666e..9b0418a3dc0d 100644 } EXPORT_SYMBOL(misc_register); -@@ -261,11 +250,10 @@ void misc_deregister(struct miscdevice *misc) +@@ -296,11 +283,10 @@ void misc_deregister(struct miscdevice * if (WARN_ON(list_empty(&misc->list))) return; - mutex_lock(&misc_mtx); + guard(mutex)(&misc_mtx); list_del(&misc->list); - device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor)); + device_destroy(&misc_class, MKDEV(MISC_MAJOR, misc->minor)); misc_minor_free(misc->minor); - mutex_unlock(&misc_mtx); } EXPORT_SYMBOL(misc_deregister); -@@ -280,29 +268,24 @@ static char *misc_devnode(const struct device *dev, umode_t *mode) - return NULL; - } - -+DEFINE_FREE(class_destroy, struct class *, if (_T) class_destroy(_T)); -+DEFINE_FREE(remove_misc_proc, struct proc_dir_entry *, if (_T) remove_proc_entry("misc", NULL)); - static int __init misc_init(void) - { -- int err; -- struct proc_dir_entry *ret; -+ struct proc_dir_entry *ret __free(remove_misc_proc) = proc_create_seq("misc", 0, NULL, &misc_seq_ops); -+ struct class *c __free(class_destroy) = class_create("misc"); - -- ret = proc_create_seq("misc", 0, NULL, &misc_seq_ops); -- misc_class = class_create("misc"); -- err = PTR_ERR(misc_class); -- if (IS_ERR(misc_class)) -- goto fail_remove; -+ if (IS_ERR(c)) -+ return PTR_ERR(c); - -- err = -EIO; - if (register_chrdev(MISC_MAJOR, "misc", &misc_fops)) -- goto fail_printk; -- misc_class->devnode = misc_devnode; -- return 0; -+ return -EIO; - --fail_printk: -- pr_err("unable to get major %d for misc devices\n", MISC_MAJOR); -- class_destroy(misc_class); --fail_remove: -- if (ret) -- remove_proc_entry("misc", NULL); -- return err; -+ c->devnode = misc_devnode; -+ -+ misc_class = no_free_ptr(c); -+ no_free_ptr(ret); -+ -+ return 0; - } - subsys_initcall(misc_init); --- -2.44.0 - diff --git a/0001-readfile-implement-readfile-syscall.patch b/0001-readfile-implement-readfile-syscall.patch index 8df29869861787..4e3047d897ddbc 100644 --- a/0001-readfile-implement-readfile-syscall.patch +++ b/0001-readfile-implement-readfile-syscall.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/fs/open.c +++ b/fs/open.c -@@ -1641,3 +1641,53 @@ int stream_open(struct inode *inode, str +@@ -1653,3 +1653,53 @@ int stream_open(struct inode *inode, str } EXPORT_SYMBOL(stream_open); diff --git a/0001-vsmp-driver.patch b/0001-vsmp-driver.patch index 92a974deb85bba..d458649ab8d902 100644 --- a/0001-vsmp-driver.patch +++ b/0001-vsmp-driver.patch @@ -28,8 +28,8 @@ first cut to cleanup +Description: Shows the full version of the vSMP hypervisor --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -24105,6 +24105,12 @@ F: lib/test_printf.c - F: lib/test_scanf.c +@@ -25963,6 +25963,12 @@ F: lib/tests/printf_kunit.c + F: lib/tests/scanf_kunit.c F: lib/vsprintf.c +VSMP GUEST DRIVER diff --git a/0002-arch-wire-up-the-readfile-syscall.patch b/0002-arch-wire-up-the-readfile-syscall.patch index 4d50e8a0dd0168..c8a78c94d3733a 100644 --- a/0002-arch-wire-up-the-readfile-syscall.patch +++ b/0002-arch-wire-up-the-readfile-syscall.patch @@ -7,14 +7,11 @@ This wires up the readfile syscall for all architectures Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- - arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/alpha/kernel/syscalls/syscall.tbl | 2 ++ arch/arm/tools/syscall.tbl | 1 + - arch/arm64/include/asm/unistd.h | 2 +- - arch/arm64/include/asm/unistd32.h | 2 ++ - arch/ia64/kernel/syscalls/syscall.tbl | 1 + arch/m68k/kernel/syscalls/syscall.tbl | 1 + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + - arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 2 ++ arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + arch/parisc/kernel/syscalls/syscall.tbl | 1 + @@ -27,151 +24,124 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> arch/xtensa/kernel/syscalls/syscall.tbl | 1 + include/linux/syscalls.h | 2 ++ include/uapi/asm-generic/unistd.h | 5 ++++- - 20 files changed, 25 insertions(+), 2 deletions(-) + 17 files changed, 23 insertions(+), 1 deletion(-) --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl -@@ -490,3 +490,4 @@ - 558 common process_mrelease sys_process_mrelease - 559 common futex_waitv sys_futex_waitv - 560 common set_mempolicy_home_node sys_ni_syscall -+561 common readfile sys_readfile +@@ -507,3 +507,5 @@ + 575 common listxattrat sys_listxattrat + 576 common removexattrat sys_removexattrat + 577 common open_tree_attr sys_open_tree_attr ++578 common readfile sys_readfile ++ --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl -@@ -464,3 +464,4 @@ - 448 common process_mrelease sys_process_mrelease - 449 common futex_waitv sys_futex_waitv - 450 common set_mempolicy_home_node sys_set_mempolicy_home_node -+451 common readfile sys_readfile ---- a/arch/arm64/include/asm/unistd.h -+++ b/arch/arm64/include/asm/unistd.h -@@ -39,7 +39,7 @@ - #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5) - #define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800) - --#define __NR_compat_syscalls 451 -+#define __NR_compat_syscalls 452 - #endif - - #define __ARCH_WANT_SYS_CLONE ---- a/arch/arm64/include/asm/unistd32.h -+++ b/arch/arm64/include/asm/unistd32.h -@@ -907,6 +907,8 @@ __SYSCALL(__NR_process_mrelease, sys_pro - __SYSCALL(__NR_futex_waitv, sys_futex_waitv) - #define __NR_set_mempolicy_home_node 450 - __SYSCALL(__NR_set_mempolicy_home_node, sys_set_mempolicy_home_node) -+#define __NR_readfile 451 -+__SYSCALL(__NR_readfile, sys_readfile) - - /* - * Please add new compat syscalls above this comment and update ---- a/arch/ia64/kernel/syscalls/syscall.tbl -+++ b/arch/ia64/kernel/syscalls/syscall.tbl -@@ -371,3 +371,4 @@ - 448 common process_mrelease sys_process_mrelease - 449 common futex_waitv sys_futex_waitv - 450 common set_mempolicy_home_node sys_set_mempolicy_home_node -+451 common readfile sys_readfile +@@ -482,3 +482,4 @@ + 465 common listxattrat sys_listxattrat + 466 common removexattrat sys_removexattrat + 467 common open_tree_attr sys_open_tree_attr ++468 common readfile sys_readfile --- a/arch/m68k/kernel/syscalls/syscall.tbl +++ b/arch/m68k/kernel/syscalls/syscall.tbl -@@ -450,3 +450,4 @@ - 448 common process_mrelease sys_process_mrelease - 449 common futex_waitv sys_futex_waitv - 450 common set_mempolicy_home_node sys_set_mempolicy_home_node -+451 common readfile sys_readfile +@@ -467,3 +467,4 @@ + 465 common listxattrat sys_listxattrat + 466 common removexattrat sys_removexattrat + 467 common open_tree_attr sys_open_tree_attr ++468 common readfile sys_readfile --- a/arch/microblaze/kernel/syscalls/syscall.tbl +++ b/arch/microblaze/kernel/syscalls/syscall.tbl -@@ -456,3 +456,4 @@ - 448 common process_mrelease sys_process_mrelease - 449 common futex_waitv sys_futex_waitv - 450 common set_mempolicy_home_node sys_set_mempolicy_home_node -+451 common readfile sys_readfile +@@ -473,3 +473,4 @@ + 465 common listxattrat sys_listxattrat + 466 common removexattrat sys_removexattrat + 467 common open_tree_attr sys_open_tree_attr ++468 common readfile sys_readfile --- a/arch/mips/kernel/syscalls/syscall_n32.tbl +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl -@@ -389,3 +389,4 @@ - 448 n32 process_mrelease sys_process_mrelease - 449 n32 futex_waitv sys_futex_waitv - 450 n32 set_mempolicy_home_node sys_set_mempolicy_home_node -+451 n32 readfile sys_readfile +@@ -406,3 +406,5 @@ + 465 n32 listxattrat sys_listxattrat + 466 n32 removexattrat sys_removexattrat + 467 n32 open_tree_attr sys_open_tree_attr ++468 n32 readfile sys_readfile ++ --- a/arch/mips/kernel/syscalls/syscall_n64.tbl +++ b/arch/mips/kernel/syscalls/syscall_n64.tbl -@@ -365,3 +365,4 @@ - 448 n64 process_mrelease sys_process_mrelease - 449 n64 futex_waitv sys_futex_waitv - 450 common set_mempolicy_home_node sys_set_mempolicy_home_node -+451 n64 readfile sys_readfile +@@ -382,3 +382,4 @@ + 465 n64 listxattrat sys_listxattrat + 466 n64 removexattrat sys_removexattrat + 467 n64 open_tree_attr sys_open_tree_attr ++468 n64 readfile sys_readfile --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl -@@ -438,3 +438,4 @@ - 448 o32 process_mrelease sys_process_mrelease - 449 o32 futex_waitv sys_futex_waitv - 450 o32 set_mempolicy_home_node sys_set_mempolicy_home_node -+451 o32 readfile sys_readfile +@@ -455,3 +455,4 @@ + 465 o32 listxattrat sys_listxattrat + 466 o32 removexattrat sys_removexattrat + 467 o32 open_tree_attr sys_open_tree_attr ++468 o32 readfile sys_readfile --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl -@@ -448,3 +448,4 @@ - 448 common process_mrelease sys_process_mrelease - 449 common futex_waitv sys_futex_waitv - 450 common set_mempolicy_home_node sys_set_mempolicy_home_node -+451 common readfile sys_readfile +@@ -466,3 +466,4 @@ + 465 common listxattrat sys_listxattrat + 466 common removexattrat sys_removexattrat + 467 common open_tree_attr sys_open_tree_attr ++468 common readfile sys_readfile --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl -@@ -537,3 +537,4 @@ - 448 common process_mrelease sys_process_mrelease - 449 common futex_waitv sys_futex_waitv - 450 nospu set_mempolicy_home_node sys_set_mempolicy_home_node -+451 common readfile sys_readfile +@@ -558,3 +558,4 @@ + 465 common listxattrat sys_listxattrat + 466 common removexattrat sys_removexattrat + 467 common open_tree_attr sys_open_tree_attr ++468 common readfile sys_readfile --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl -@@ -453,3 +453,4 @@ - 448 common process_mrelease sys_process_mrelease sys_process_mrelease - 449 common futex_waitv sys_futex_waitv sys_futex_waitv - 450 common set_mempolicy_home_node sys_set_mempolicy_home_node sys_set_mempolicy_home_node -+451 common readfile sys_readfile sys_readfile +@@ -470,3 +470,4 @@ + 465 common listxattrat sys_listxattrat sys_listxattrat + 466 common removexattrat sys_removexattrat sys_removexattrat + 467 common open_tree_attr sys_open_tree_attr sys_open_tree_attr ++468 common readfile sys_readfile sys_readfile --- a/arch/sh/kernel/syscalls/syscall.tbl +++ b/arch/sh/kernel/syscalls/syscall.tbl -@@ -453,3 +453,4 @@ - 448 common process_mrelease sys_process_mrelease - 449 common futex_waitv sys_futex_waitv - 450 common set_mempolicy_home_node sys_set_mempolicy_home_node -+451 common readfile sys_readfile +@@ -471,3 +471,4 @@ + 465 common listxattrat sys_listxattrat + 466 common removexattrat sys_removexattrat + 467 common open_tree_attr sys_open_tree_attr ++468 common readfile sys_readfile --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl -@@ -496,3 +496,4 @@ - 448 common process_mrelease sys_process_mrelease - 449 common futex_waitv sys_futex_waitv - 450 common set_mempolicy_home_node sys_set_mempolicy_home_node -+451 common readfile sys_readfile +@@ -513,3 +513,4 @@ + 465 common listxattrat sys_listxattrat + 466 common removexattrat sys_removexattrat + 467 common open_tree_attr sys_open_tree_attr ++468 common readfile sys_readfile --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl -@@ -455,3 +455,4 @@ - 448 i386 process_mrelease sys_process_mrelease - 449 i386 futex_waitv sys_futex_waitv - 450 i386 set_mempolicy_home_node sys_set_mempolicy_home_node -+451 i386 readfile sys_readfile +@@ -473,3 +473,4 @@ + 465 i386 listxattrat sys_listxattrat + 466 i386 removexattrat sys_removexattrat + 467 i386 open_tree_attr sys_open_tree_attr ++468 i386 readfile sys_readfile --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl -@@ -372,6 +372,7 @@ - 448 common process_mrelease sys_process_mrelease - 449 common futex_waitv sys_futex_waitv - 450 common set_mempolicy_home_node sys_set_mempolicy_home_node -+451 common readfile sys_readfile +@@ -391,6 +391,7 @@ + 465 common listxattrat sys_listxattrat + 466 common removexattrat sys_removexattrat + 467 common open_tree_attr sys_open_tree_attr ++468 common readfile sys_readfile # # Due to a historical design error, certain syscalls are numbered differently --- a/arch/xtensa/kernel/syscalls/syscall.tbl +++ b/arch/xtensa/kernel/syscalls/syscall.tbl -@@ -421,3 +421,4 @@ - 448 common process_mrelease sys_process_mrelease - 449 common futex_waitv sys_futex_waitv - 450 common set_mempolicy_home_node sys_set_mempolicy_home_node -+451 common readfile sys_readfile +@@ -438,3 +438,4 @@ + 465 common listxattrat sys_listxattrat + 466 common removexattrat sys_removexattrat + 467 common open_tree_attr sys_open_tree_attr ++468 common readfile sys_readfile --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h -@@ -1058,6 +1058,8 @@ asmlinkage long sys_memfd_secret(unsigne - asmlinkage long sys_set_mempolicy_home_node(unsigned long start, unsigned long len, - unsigned long home_node, - unsigned long flags); +@@ -988,6 +988,8 @@ asmlinkage long sys_lsm_get_self_attr(un + asmlinkage long sys_lsm_set_self_attr(unsigned int attr, struct lsm_ctx __user *ctx, + u32 size, u32 flags); + asmlinkage long sys_lsm_list_modules(u64 __user *ids, u32 __user *size, u32 flags); +asmlinkage long sys_readfile(int dfd, const char __user *filename, + char __user *buffer, size_t bufsize, int flags); @@ -179,16 +149,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> * Architecture-specific system calls --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h -@@ -886,8 +886,11 @@ __SYSCALL(__NR_futex_waitv, sys_futex_wa - #define __NR_set_mempolicy_home_node 450 - __SYSCALL(__NR_set_mempolicy_home_node, sys_set_mempolicy_home_node) +@@ -852,8 +852,11 @@ __SYSCALL(__NR_removexattrat, sys_remove + #define __NR_open_tree_attr 467 + __SYSCALL(__NR_open_tree_attr, sys_open_tree_attr) -+#define __NR_readfile 451 ++#define __NR_readfile 468 +__SYSCALL(__NR_readfile, sys_readfile) + #undef __NR_syscalls --#define __NR_syscalls 451 -+#define __NR_syscalls 452 +-#define __NR_syscalls 468 ++#define __NR_syscalls 469 /* * 32 bit systems traditionally used different diff --git a/0003-selftests-add-readfile-2-selftests.patch b/0003-selftests-add-readfile-2-selftests.patch index 68eecc16d4dff7..a02f7112158db3 100644 --- a/0003-selftests-add-readfile-2-selftests.patch +++ b/0003-selftests-add-readfile-2-selftests.patch @@ -25,14 +25,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile -@@ -68,6 +68,7 @@ TARGETS += riscv - TARGETS += rlimits - TARGETS += rseq - TARGETS += rtc +@@ -87,6 +87,7 @@ TARGETS += proc + TARGETS += pstore + TARGETS += ptrace + TARGETS += openat2 +TARGETS += readfile - TARGETS += seccomp - TARGETS += sgx - TARGETS += sigaltstack + TARGETS += resctrl + TARGETS += riscv + TARGETS += rlimits --- /dev/null +++ b/tools/testing/selftests/readfile/.gitignore @@ -0,0 +1,3 @@ @@ -343,7 +343,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +//#define __NR_readfile -1 +//#endif + -+#define __NR_readfile 451 ++#define __NR_readfile 468 + +static inline int sys_readfile(int fd, const char *filename, + unsigned char *buffer, size_t bufsize, int flags) diff --git a/qlcnic_sysfs.patch b/qlcnic_sysfs.patch index 5eb02aeabc25ed..838a7474c88c02 100644 --- a/qlcnic_sysfs.patch +++ b/qlcnic_sysfs.patch @@ -90,7 +90,7 @@ +static DEVICE_ATTR_RW(beacon); static ssize_t qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj, - struct bin_attribute *attr, char *buf, + const struct bin_attribute *attr, char *buf, @@ -1174,24 +1175,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w return size; } @@ -116,7 +116,7 @@ static const struct bin_attribute bin_attr_crb = { .attr = { .name = "crb", .mode = 0644 }, .size = 0, -@@ -1317,6 +1300,24 @@ void qlcnic_unregister_hwmon_dev(struct +@@ -1316,6 +1299,24 @@ void qlcnic_unregister_hwmon_dev(struct } #endif @@ -141,7 +141,7 @@ void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; -@@ -1330,6 +1331,11 @@ void qlcnic_create_sysfs_entries(struct +@@ -1329,6 +1330,11 @@ void qlcnic_create_sysfs_entries(struct void qlcnic_remove_sysfs_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; diff --git a/spdxcheck-print-out-files-without-any-spdx-lines.patch b/spdxcheck-print-out-files-without-any-spdx-lines.patch index 2bb7bbd5c6cb9c..eeb9281a51f3b9 100644 --- a/spdxcheck-print-out-files-without-any-spdx-lines.patch +++ b/spdxcheck-print-out-files-without-any-spdx-lines.patch @@ -14,7 +14,7 @@ Just a hack to make it easy to see what still needs to be converted. --- a/scripts/spdxcheck.py +++ b/scripts/spdxcheck.py -@@ -298,7 +298,10 @@ def scan_git_tree(tree, basedir, dirdept +@@ -304,7 +304,10 @@ def scan_git_tree(tree, basedir, dirdept parser.excluded += 1 continue with open(el.path, 'rb') as fd: diff --git a/usb.patch b/usb.patch index bfaed2e78bb9b1..16e3d2ad410205 100644 --- a/usb.patch +++ b/usb.patch @@ -4,7 +4,7 @@ --- a/drivers/usb/storage/unusual_uas.h +++ b/drivers/usb/storage/unusual_uas.h -@@ -118,6 +118,17 @@ UNUSUAL_DEV(0x152d, 0x0583, 0x0000, 0x99 +@@ -125,6 +125,17 @@ UNUSUAL_DEV(0x152d, 0x0583, 0x0000, 0x99 USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_REPORT_OPCODES), |