aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-03-26 15:19:42 +0100
committerPetr Štetiar <ynezz@true.cz>2020-03-28 13:03:02 +0100
commit5ecc0cfd6f3da1e8f573024753169aa6f115745e (patch)
tree23aa098938d7a572de3f56bc35661cd5cb2a05aa /target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch
parentbf15557f8a85e7ada25074122f4af5bd3a5df697 (diff)
downloadupstream-5ecc0cfd6f3da1e8f573024753169aa6f115745e.tar.gz
upstream-5ecc0cfd6f3da1e8f573024753169aa6f115745e.tar.bz2
upstream-5ecc0cfd6f3da1e8f573024753169aa6f115745e.zip
kernel: bump 5.4 to 5.4.28
Changelog since 5.4.24 mentions CVE-2019-19769, CVE-2020-8648, CVE-2020-8649 and CVE-2020-8647. Removed upstreamed: generic: 507-v5.6-iio-chemical-sps30-fix-missing-triggered-buffer-depe.patch generic: 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch bcm27xx: 950-0435-ASoC-pcm512x-Fix-unbalanced-regulator-enable-call-in.patch ipq806x: 701-stmmac-fix-notifier-registration.patch lantiq: 002-pinctrl-falcon-fix-syntax-error.patch octeontx: 0002-net-thunderx-workaround-BGX-TX-Underflow-issue.patch Run tested: apu2, qemu-x86-64, apalis, a64-olinuxino, nbg6617 Build tested: sunxi/a53, imx6, x86/64, ipq40xx Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [apu2] Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch b/target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch
index 1128ac0c36..1d356eb6ab 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch
@@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-3-hdego
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
-@@ -1721,7 +1721,7 @@ bool drm_mode_parse_command_line_for_con
+@@ -1728,7 +1728,7 @@ bool drm_mode_parse_command_line_for_con
const char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL;
const char *options_ptr = NULL;
char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL;
@@ -36,7 +36,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-3-hdego
#ifdef CONFIG_FB
if (!mode_option)
-@@ -1841,9 +1841,11 @@ bool drm_mode_parse_command_line_for_con
+@@ -1848,9 +1848,11 @@ bool drm_mode_parse_command_line_for_con
else if (refresh_ptr)
extra_ptr = refresh_end_ptr;
@@ -53,14 +53,14 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-3-hdego
connector, mode);
--- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
+++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
-@@ -60,3 +60,4 @@ cmdline_test(drm_cmdline_test_vmirror)
+@@ -61,3 +61,4 @@ cmdline_test(drm_cmdline_test_vmirror)
cmdline_test(drm_cmdline_test_margin_options)
cmdline_test(drm_cmdline_test_multiple_options)
cmdline_test(drm_cmdline_test_invalid_option)
+cmdline_test(drm_cmdline_test_bpp_extra_and_option)
--- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
+++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
-@@ -992,6 +992,32 @@ static int drm_cmdline_test_invalid_opti
+@@ -1003,6 +1003,32 @@ static int drm_cmdline_test_invalid_opti
return 0;
}