diff options
| author | Petr Štetiar <ynezz@true.cz> | 2021-12-12 08:19:37 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2021-12-19 08:23:23 +0100 |
| commit | 1d94f72439034c112bfa4b694fc736123f4890a5 (patch) | |
| tree | c0c916ea430038c38dfe0eec583ec31dacd2b6af /target/linux/brcm2708 | |
| parent | cc8c1be438a3d19fec06b72b1e7854f31b9e2f71 (diff) | |
| download | upstream-1d94f72439034c112bfa4b694fc736123f4890a5.tar.gz upstream-1d94f72439034c112bfa4b694fc736123f4890a5.tar.bz2 upstream-1d94f72439034c112bfa4b694fc736123f4890a5.zip | |
kernel: bump 4.14 to 4.14.258
Rebased patches:
* generic: 273-batman-adv-Convert-packet.h-to-uapi-header.patch
* ipq806x: 0065-arm-override-compiler-flags.patch
* mvebu: 513-arm64-dts-marvell-armada37xx-Add-emmc-sdio-pinctrl-d.patch
Removed patches:
Fixed upstream:
* ar71xx: 821-serial-core-add-support-for-boot-console-with-arbitr.patch
* ath79: 921-serial-core-add-support-for-boot-console-with-arbitr.patch
- in 4.14.256 via 9112e7ef87149b3d8093e7446d784117f6e18d69
* mvebu: 527-PCI-aardvark-allow-to-specify-link-capability.patch
- in 4.14.257 via 62a3dc9b65a2b24800fc4267b8cf590fad135034
* mvebu: 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch
- should be hopefully fixed by the bunch of changes in .256 and .257
Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia.
Fixes: CVE-2021-3640
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/brcm2708')
3 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch index ef19837e2f..ba94cb8a76 100644 --- a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch +++ b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch @@ -841,7 +841,7 @@ Signed-off-by: Malik Olivier Boussejra <malik@boussejra.com> } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5177,7 +5177,7 @@ static void port_event(struct usb_hub *h +@@ -5187,7 +5187,7 @@ static void port_event(struct usb_hub *h if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; diff --git a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch index 758d8f81c2..a6609a8ec9 100644 --- a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -5219,6 +5219,9 @@ int __init cgroup_init_early(void) +@@ -5242,6 +5242,9 @@ int __init cgroup_init_early(void) return 0; } @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /** * cgroup_init - cgroup initialization * -@@ -5256,6 +5259,12 @@ int __init cgroup_init(void) +@@ -5279,6 +5282,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -5637,6 +5646,10 @@ static int __init cgroup_disable(char *s +@@ -5660,6 +5669,10 @@ static int __init cgroup_disable(char *s strcmp(token, ss->legacy_name)) continue; @@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> static_branch_disable(cgroup_subsys_enabled_key[i]); pr_info("Disabling %s control group subsystem\n", ss->name); -@@ -5646,6 +5659,31 @@ static int __init cgroup_disable(char *s +@@ -5669,6 +5682,31 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); diff --git a/target/linux/brcm2708/patches-4.14/950-0174-drm-vc4-Add-the-DRM_IOCTL_VC4_GEM_MADVISE-ioctl.patch b/target/linux/brcm2708/patches-4.14/950-0174-drm-vc4-Add-the-DRM_IOCTL_VC4_GEM_MADVISE-ioctl.patch index 0e410c484c..8326d4bcad 100644 --- a/target/linux/brcm2708/patches-4.14/950-0174-drm-vc4-Add-the-DRM_IOCTL_VC4_GEM_MADVISE-ioctl.patch +++ b/target/linux/brcm2708/patches-4.14/950-0174-drm-vc4-Add-the-DRM_IOCTL_VC4_GEM_MADVISE-ioctl.patch @@ -181,7 +181,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20171019125748.3152-1-boris. enum vc4_kernel_bo_type type) @@ -294,6 +419,9 @@ struct drm_gem_object *vc4_create_object if (!bo) - return ERR_PTR(-ENOMEM); + return NULL; + bo->madv = VC4_MADV_WILLNEED; + refcount_set(&bo->usecnt, 0); |