mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-13 22:22:10 +00:00
5ecc0cfd6f
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>
51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
From 250363a413cd08e723789e1b8821608ff5eebfe6 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Mon, 18 Nov 2019 16:51:23 +0100
|
|
Subject: [PATCH] drm/modes: parse_cmdline: Make various char pointers
|
|
const
|
|
|
|
Commit 83e14ea3a64f00897cc31974d3ae4e27e5a7405b upstream.
|
|
|
|
We are not supposed to modify the passed in string, make char pointers
|
|
used in drm_mode_parse_cmdline_options() const char * where possible.
|
|
|
|
Acked-by: Maxime Ripard <mripard@kernel.org>
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-2-hdegoede@redhat.com
|
|
---
|
|
drivers/gpu/drm/drm_modes.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/drm_modes.c
|
|
+++ b/drivers/gpu/drm/drm_modes.c
|
|
@@ -1591,15 +1591,15 @@ static int drm_mode_parse_cmdline_int(co
|
|
return 0;
|
|
}
|
|
|
|
-static int drm_mode_parse_cmdline_options(char *str, size_t len,
|
|
+static int drm_mode_parse_cmdline_options(const char *str, size_t len,
|
|
const struct drm_connector *connector,
|
|
struct drm_cmdline_mode *mode)
|
|
{
|
|
unsigned int deg, margin, rotation = 0;
|
|
- char *sep = str;
|
|
+ const char *sep = str;
|
|
|
|
while ((sep = strchr(sep, ','))) {
|
|
- char *delim, *option;
|
|
+ const char *delim, *option;
|
|
|
|
option = sep + 1;
|
|
delim = strchr(option, '=');
|
|
@@ -1725,8 +1725,8 @@ bool drm_mode_parse_command_line_for_con
|
|
bool named_mode = false, parse_extras = false;
|
|
unsigned int bpp_off = 0, refresh_off = 0, options_off = 0;
|
|
unsigned int mode_end = 0;
|
|
- char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL;
|
|
- char *options_ptr = NULL;
|
|
+ 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;
|
|
int ret;
|
|
|