From: Greg Kroah-Hartman Date: Fri, 2 Nov 2018 05:16:01 +0000 (+0100) Subject: fix up patch fuzz X-Git-Tag: v4.19.1~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6ed3816cb55fbd963d3153d5e1ed8b82dbccdf7;p=thirdparty%2Fkernel%2Fstable-queue.git fix up patch fuzz --- diff --git a/queue-4.14/drm-i915-gvt-fix-memory-leak-of-a-cmd_entry-struct-o.patch b/queue-4.14/drm-i915-gvt-fix-memory-leak-of-a-cmd_entry-struct-o.patch index 3ee29aebe78..63a64f1bc92 100644 --- a/queue-4.14/drm-i915-gvt-fix-memory-leak-of-a-cmd_entry-struct-o.patch +++ b/queue-4.14/drm-i915-gvt-fix-memory-leak-of-a-cmd_entry-struct-o.patch @@ -19,14 +19,12 @@ Signed-off-by: Sudip Mukherjee Acked-by: Zhenyu Wang Signed-off-by: Sasha Levin --- - drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c -index d4726a3358a4..d6993c2707d1 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c -@@ -2802,6 +2802,7 @@ static int init_cmd_table(struct intel_gvt *gvt) +@@ -2802,6 +2802,7 @@ static int init_cmd_table(struct intel_g if (info) { gvt_err("%s %s duplicated\n", e->info->name, info->name); @@ -34,6 +32,3 @@ index d4726a3358a4..d6993c2707d1 100644 return -EEXIST; } --- -2.17.1 - diff --git a/queue-4.14/lan78xx-don-t-reset-the-interface-on-open.patch b/queue-4.14/lan78xx-don-t-reset-the-interface-on-open.patch index 48377082666..dd8306cafd9 100644 --- a/queue-4.14/lan78xx-don-t-reset-the-interface-on-open.patch +++ b/queue-4.14/lan78xx-don-t-reset-the-interface-on-open.patch @@ -18,14 +18,12 @@ Signed-off-by: Phil Elwell Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - drivers/net/usb/lan78xx.c | 4 ---- + drivers/net/usb/lan78xx.c | 4 ---- 1 file changed, 4 deletions(-) -diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index 9e3f632e22f1..a090112880fd 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2517,10 +2517,6 @@ static int lan78xx_open(struct net_device *net) +@@ -2508,10 +2508,6 @@ static int lan78xx_open(struct net_devic if (ret < 0) goto out; @@ -36,6 +34,3 @@ index 9e3f632e22f1..a090112880fd 100644 phy_start(net->phydev); netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); --- -2.17.1 - diff --git a/queue-4.14/scsi-sd-remember-that-read-capacity-16-succeeded.patch b/queue-4.14/scsi-sd-remember-that-read-capacity-16-succeeded.patch index 8e8889ee828..888c6677bbf 100644 --- a/queue-4.14/scsi-sd-remember-that-read-capacity-16-succeeded.patch +++ b/queue-4.14/scsi-sd-remember-that-read-capacity-16-succeeded.patch @@ -25,14 +25,12 @@ Reviewed-by: Laurence Oberman Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- - drivers/scsi/sd.c | 2 ++ + drivers/scsi/sd.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 4a532318b211..b0dd8bdfdf98 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c -@@ -2497,6 +2497,8 @@ sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer) +@@ -2498,6 +2498,8 @@ sd_read_capacity(struct scsi_disk *sdkp, sector_size = old_sector_size; goto got_data; } @@ -41,6 +39,3 @@ index 4a532318b211..b0dd8bdfdf98 100644 } } --- -2.17.1 - diff --git a/queue-4.4/bonding-avoid-defaulting-hard_header_len-to-eth_hlen.patch b/queue-4.4/bonding-avoid-defaulting-hard_header_len-to-eth_hlen.patch index d3e31dda1f2..3bf5363811e 100644 --- a/queue-4.4/bonding-avoid-defaulting-hard_header_len-to-eth_hlen.patch +++ b/queue-4.4/bonding-avoid-defaulting-hard_header_len-to-eth_hlen.patch @@ -66,14 +66,12 @@ Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - drivers/net/bonding/bond_main.c | 2 +- + drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c -index 339118f3c718..9e6159271c26 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c -@@ -1106,11 +1106,11 @@ static void bond_compute_features(struct bonding *bond) +@@ -1107,11 +1107,11 @@ static void bond_compute_features(struct gso_max_size = min(gso_max_size, slave->dev->gso_max_size); gso_max_segs = min(gso_max_segs, slave->dev->gso_max_segs); } @@ -86,6 +84,3 @@ index 339118f3c718..9e6159271c26 100644 bond_dev->gso_max_segs = gso_max_segs; netif_set_gso_max_size(bond_dev, gso_max_size); --- -2.17.1 - diff --git a/queue-4.4/bpf-generally-move-prog-destruction-to-rcu-deferral.patch b/queue-4.4/bpf-generally-move-prog-destruction-to-rcu-deferral.patch index 170f43cc4ad..62511492739 100644 --- a/queue-4.4/bpf-generally-move-prog-destruction-to-rcu-deferral.patch +++ b/queue-4.4/bpf-generally-move-prog-destruction-to-rcu-deferral.patch @@ -61,17 +61,15 @@ Acked-by: Alexei Starovoitov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - include/linux/bpf.h | 5 ----- - kernel/bpf/arraymap.c | 4 +--- - kernel/bpf/syscall.c | 13 +++---------- - kernel/events/core.c | 2 +- + include/linux/bpf.h | 5 ----- + kernel/bpf/arraymap.c | 4 +--- + kernel/bpf/syscall.c | 13 +++---------- + kernel/events/core.c | 2 +- 4 files changed, 5 insertions(+), 19 deletions(-) -diff --git a/include/linux/bpf.h b/include/linux/bpf.h -index 132585a7fbd8..bae3da5bcda0 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h -@@ -177,7 +177,6 @@ void bpf_register_map_type(struct bpf_map_type_list *tl); +@@ -177,7 +177,6 @@ void bpf_register_map_type(struct bpf_ma struct bpf_prog *bpf_prog_get(u32 ufd); struct bpf_prog *bpf_prog_inc(struct bpf_prog *prog); void bpf_prog_put(struct bpf_prog *prog); @@ -79,7 +77,7 @@ index 132585a7fbd8..bae3da5bcda0 100644 struct bpf_map *bpf_map_get_with_uref(u32 ufd); struct bpf_map *__bpf_map_get(struct fd f); -@@ -208,10 +207,6 @@ static inline struct bpf_prog *bpf_prog_get(u32 ufd) +@@ -208,10 +207,6 @@ static inline struct bpf_prog *bpf_prog_ static inline void bpf_prog_put(struct bpf_prog *prog) { } @@ -90,11 +88,9 @@ index 132585a7fbd8..bae3da5bcda0 100644 #endif /* CONFIG_BPF_SYSCALL */ /* verifier prototypes for helper functions called from eBPF programs */ -diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c -index 0eb11b4ac4c7..daa4e0782cf7 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c -@@ -270,9 +270,7 @@ static void *prog_fd_array_get_ptr(struct bpf_map *map, int fd) +@@ -270,9 +270,7 @@ static void *prog_fd_array_get_ptr(struc static void prog_fd_array_put_ptr(void *ptr) { @@ -105,11 +101,9 @@ index 0eb11b4ac4c7..daa4e0782cf7 100644 } /* decrement refcnt of all bpf_progs that are stored in this map */ -diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 4b9bbfe764e8..04fc1022ad9f 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c -@@ -487,7 +487,7 @@ static void bpf_prog_uncharge_memlock(struct bpf_prog *prog) +@@ -487,7 +487,7 @@ static void bpf_prog_uncharge_memlock(st free_uid(user); } @@ -118,7 +112,7 @@ index 4b9bbfe764e8..04fc1022ad9f 100644 { struct bpf_prog_aux *aux = container_of(rcu, struct bpf_prog_aux, rcu); -@@ -496,17 +496,10 @@ static void __prog_put_common(struct rcu_head *rcu) +@@ -496,17 +496,10 @@ static void __prog_put_common(struct rcu bpf_prog_free(aux->prog); } @@ -137,7 +131,7 @@ index 4b9bbfe764e8..04fc1022ad9f 100644 } EXPORT_SYMBOL_GPL(bpf_prog_put); -@@ -514,7 +507,7 @@ static int bpf_prog_release(struct inode *inode, struct file *filp) +@@ -514,7 +507,7 @@ static int bpf_prog_release(struct inode { struct bpf_prog *prog = filp->private_data; @@ -146,11 +140,9 @@ index 4b9bbfe764e8..04fc1022ad9f 100644 return 0; } -diff --git a/kernel/events/core.c b/kernel/events/core.c -index 68b75dfceb0c..21e825250402 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c -@@ -7139,7 +7139,7 @@ static void perf_event_free_bpf_prog(struct perf_event *event) +@@ -7141,7 +7141,7 @@ static void perf_event_free_bpf_prog(str prog = event->tp_event->prog; if (prog && event->tp_event->bpf_prog_owner == event) { event->tp_event->prog = NULL; @@ -159,6 +151,3 @@ index 68b75dfceb0c..21e825250402 100644 } } --- -2.17.1 - diff --git a/queue-4.4/perf-core-don-t-leak-event-in-the-syscall-error-path.patch b/queue-4.4/perf-core-don-t-leak-event-in-the-syscall-error-path.patch index abb0a3cc248..cbfe71493f4 100644 --- a/queue-4.4/perf-core-don-t-leak-event-in-the-syscall-error-path.patch +++ b/queue-4.4/perf-core-don-t-leak-event-in-the-syscall-error-path.patch @@ -25,14 +25,12 @@ Link: http://lkml.kernel.org/r/87twk06yxp.fsf@ashishki-desk.ger.corp.intel.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- - kernel/events/core.c | 1 + + kernel/events/core.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/kernel/events/core.c b/kernel/events/core.c -index 990ac41d8a5f..68b75dfceb0c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c -@@ -8530,6 +8530,7 @@ SYSCALL_DEFINE5(perf_event_open, +@@ -8532,6 +8532,7 @@ SYSCALL_DEFINE5(perf_event_open, f_flags); if (IS_ERR(event_file)) { err = PTR_ERR(event_file); @@ -40,6 +38,3 @@ index 990ac41d8a5f..68b75dfceb0c 100644 goto err_context; } --- -2.17.1 - diff --git a/queue-4.4/perf-tools-disable-parallelism-for-make-clean.patch b/queue-4.4/perf-tools-disable-parallelism-for-make-clean.patch index 8a20d4b2c91..fdc36ec95ed 100644 --- a/queue-4.4/perf-tools-disable-parallelism-for-make-clean.patch +++ b/queue-4.4/perf-tools-disable-parallelism-for-make-clean.patch @@ -31,11 +31,9 @@ Link: http://lkml.kernel.org/r/20180705131527.19749-1-linux@rasmusvillemoes.dk Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- - tools/perf/Makefile | 4 ++-- + tools/perf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/tools/perf/Makefile b/tools/perf/Makefile -index dcd9a70c7193..55933b2eb932 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -69,10 +69,10 @@ all tags TAGS: @@ -51,6 +49,3 @@ index dcd9a70c7193..55933b2eb932 100644 # # The build-test target is not really parallel, don't print the jobs info: --- -2.17.1 - diff --git a/queue-4.9/perf-tools-disable-parallelism-for-make-clean.patch b/queue-4.9/perf-tools-disable-parallelism-for-make-clean.patch index fc2f7e41c53..bac71d02acd 100644 --- a/queue-4.9/perf-tools-disable-parallelism-for-make-clean.patch +++ b/queue-4.9/perf-tools-disable-parallelism-for-make-clean.patch @@ -31,11 +31,9 @@ Link: http://lkml.kernel.org/r/20180705131527.19749-1-linux@rasmusvillemoes.dk Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- - tools/perf/Makefile | 4 ++-- + tools/perf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/tools/perf/Makefile b/tools/perf/Makefile -index 32a64e619028..cd86fd7b35c4 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -83,10 +83,10 @@ endif # has_clean @@ -51,6 +49,3 @@ index 32a64e619028..cd86fd7b35c4 100644 # # The build-test target is not really parallel, don't print the jobs info, --- -2.17.1 -