From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J. Wysocki" <rafael@kernel.org>, Stuart Yoder <stuyoder@gmail.com>, Laurentiu Tudor <laurentiu.tudor@nxp.com>, Abel Vesa <abel.vesa@nxp.com>, Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de>, Fabio Estevam <festevam@gmail.com>, "K. Y. Srinivasan" <kys@microsoft.com>, Haiyang Zhang <haiyangz@microsoft.com>, Stephen Hemminger <sthemmin@microsoft.com>, Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>, Bjorn Helgaas <bhelgaas@google.com>, Bjorn Andersson <bjorn.andersson@linaro.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, Vineeth Vijayan <vneethv@linux.ibm.com>, Peter Oberparleiter <oberpar@linux.ibm.com>, Heiko Carstens <hca@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>, Alexander Gordeev <agordeev@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Sven Schnelle <svens@linux.ibm.com>, Andy Gross <agross@kernel.org>, Srinivas Kandagatla <srinivas.kandagatla@linaro.org>, Mark Brown <broonie@kernel.org>, "Michael S. Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, NXP Linux Team <linux-imx@nxp.com>, linux-arm-kernel@lists.infradead.org, linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, virtualization@lists.linux-foundation.org, Linus Torvalds <torvalds@linux-foundation.org> Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Subject: [PATCH v2 07/11] spi: use helper for safer setting of driver_override Date: Wed, 23 Feb 2022 20:14:37 +0100 [thread overview] Message-ID: <20220223191441.348109-1-krzysztof.kozlowski@canonical.com> (raw) In-Reply-To: <20220223191310.347669-1-krzysztof.kozlowski@canonical.com> Use a helper for seting driver_override to reduce amount of duplicated code. Remove also "const" from the definition of spi_device.driver_override, because it is not correct. The SPI driver already treats it as dynamic, not const, memory. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- drivers/spi/spi.c | 20 ++++---------------- include/linux/spi/spi.h | 2 +- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 4599b121d744..0c7e2c34f4a3 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -74,27 +74,15 @@ static ssize_t driver_override_store(struct device *dev, struct spi_device *spi = to_spi_device(dev); const char *end = memchr(buf, '\n', count); const size_t len = end ? end - buf : count; - const char *driver_override, *old; + int ret; /* We need to keep extra room for a newline when displaying value */ if (len >= (PAGE_SIZE - 1)) return -EINVAL; - driver_override = kstrndup(buf, len, GFP_KERNEL); - if (!driver_override) - return -ENOMEM; - - device_lock(dev); - old = spi->driver_override; - if (len) { - spi->driver_override = driver_override; - } else { - /* Empty string, disable driver override */ - spi->driver_override = NULL; - kfree(driver_override); - } - device_unlock(dev); - kfree(old); + ret = driver_set_override(dev, &spi->driver_override, buf); + if (ret) + return ret; return count; } diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 7ab3fed7b804..01224d07aaff 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -184,7 +184,7 @@ struct spi_device { void *controller_state; void *controller_data; char modalias[SPI_NAME_SIZE]; - const char *driver_override; + char *driver_override; int cs_gpio; /* LEGACY: chip select gpio */ struct gpio_desc *cs_gpiod; /* chip select gpio desc */ struct spi_delay word_delay; /* inter-word delay */ -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J. Wysocki" <rafael@kernel.org>, Stuart Yoder <stuyoder@gmail.com>, Laurentiu Tudor <laurentiu.tudor@nxp.com>, Abel Vesa <abel.vesa@nxp.com>, Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de>, Fabio Estevam <festevam@gmail.com>, "K. Y. Srinivasan" <kys@microsoft.com>, Haiyang Zhang <haiyangz@microsoft.com>, Stephen Hemminger <sthemmin@microsoft.com>, Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>, Bjorn Helgaas <bhelgaas@google.com>, Bjorn Andersson <bjorn.andersson@linaro.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, Vineeth Vijayan <vneethv@linux.ibm.com>, Peter Oberparleiter <oberpar@linux.ibm.com>, Heiko Carstens <hca@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>, Alexander Gordeev <agordeev@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Sven Schnelle <svens@linux.ibm.com>, Andy Gross <agross@kernel.org>, Srinivas Kandagatla <srinivas.kandagatla@linaro.org>, Mark Brown <broonie@kernel.org>, "Michael S. Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, NXP Linux Team <linux-imx@nxp.com>, linux-arm-kernel@lists.infradead.org, linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, virtualization@lists.linux-foundation.org, Linus Torvalds <torvalds@linux-foundation.org> Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Subject: [PATCH v2 07/11] spi: use helper for safer setting of driver_override Date: Wed, 23 Feb 2022 20:14:37 +0100 [thread overview] Message-ID: <20220223191441.348109-1-krzysztof.kozlowski@canonical.com> (raw) In-Reply-To: <20220223191310.347669-1-krzysztof.kozlowski@canonical.com> Use a helper for seting driver_override to reduce amount of duplicated code. Remove also "const" from the definition of spi_device.driver_override, because it is not correct. The SPI driver already treats it as dynamic, not const, memory. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- drivers/spi/spi.c | 20 ++++---------------- include/linux/spi/spi.h | 2 +- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 4599b121d744..0c7e2c34f4a3 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -74,27 +74,15 @@ static ssize_t driver_override_store(struct device *dev, struct spi_device *spi = to_spi_device(dev); const char *end = memchr(buf, '\n', count); const size_t len = end ? end - buf : count; - const char *driver_override, *old; + int ret; /* We need to keep extra room for a newline when displaying value */ if (len >= (PAGE_SIZE - 1)) return -EINVAL; - driver_override = kstrndup(buf, len, GFP_KERNEL); - if (!driver_override) - return -ENOMEM; - - device_lock(dev); - old = spi->driver_override; - if (len) { - spi->driver_override = driver_override; - } else { - /* Empty string, disable driver override */ - spi->driver_override = NULL; - kfree(driver_override); - } - device_unlock(dev); - kfree(old); + ret = driver_set_override(dev, &spi->driver_override, buf); + if (ret) + return ret; return count; } diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 7ab3fed7b804..01224d07aaff 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -184,7 +184,7 @@ struct spi_device { void *controller_state; void *controller_data; char modalias[SPI_NAME_SIZE]; - const char *driver_override; + char *driver_override; int cs_gpio; /* LEGACY: chip select gpio */ struct gpio_desc *cs_gpiod; /* chip select gpio desc */ struct spi_delay word_delay; /* inter-word delay */ -- 2.32.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-02-23 19:15 UTC|newest] Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-23 19:12 [PATCH v2 00/11] Fix broken usage of driver_override (and kfree of static memory) Krzysztof Kozlowski 2022-02-23 19:12 ` Krzysztof Kozlowski 2022-02-23 19:13 ` [PATCH v2 01/11] driver: platform: add and use helper for safer setting of driver_override Krzysztof Kozlowski 2022-02-23 19:13 ` Krzysztof Kozlowski 2022-02-23 21:33 ` Michael S. Tsirkin 2022-02-23 21:33 ` Michael S. Tsirkin 2022-02-23 21:33 ` Michael S. Tsirkin 2022-02-23 21:33 ` Michael S. Tsirkin 2022-02-24 7:46 ` Krzysztof Kozlowski 2022-02-24 7:46 ` Krzysztof Kozlowski 2022-02-24 7:46 ` Krzysztof Kozlowski 2022-02-23 21:53 ` Bjorn Helgaas 2022-02-23 21:53 ` Bjorn Helgaas 2022-02-23 21:53 ` Bjorn Helgaas 2022-02-23 21:53 ` Bjorn Helgaas 2022-02-24 7:47 ` Krzysztof Kozlowski 2022-02-24 7:47 ` Krzysztof Kozlowski 2022-02-24 7:47 ` Krzysztof Kozlowski 2022-02-24 8:43 ` Krzysztof Kozlowski 2022-02-24 8:43 ` Krzysztof Kozlowski 2022-02-24 8:43 ` Krzysztof Kozlowski 2022-02-23 19:13 ` [PATCH v2 02/11] amba: " Krzysztof Kozlowski 2022-02-23 19:13 ` Krzysztof Kozlowski 2022-02-23 19:13 ` [PATCH v2 03/11] fsl-mc: " Krzysztof Kozlowski 2022-02-23 19:13 ` Krzysztof Kozlowski 2022-02-23 19:13 ` [PATCH v2 04/11] hv: vmbus: " Krzysztof Kozlowski 2022-02-23 19:13 ` Krzysztof Kozlowski 2022-02-23 19:13 ` [PATCH v2 05/11] pci: " Krzysztof Kozlowski 2022-02-23 19:13 ` Krzysztof Kozlowski 2022-02-23 21:51 ` Bjorn Helgaas 2022-02-23 21:51 ` Bjorn Helgaas 2022-02-23 21:51 ` Bjorn Helgaas 2022-02-23 21:51 ` Bjorn Helgaas 2022-02-24 7:49 ` Krzysztof Kozlowski 2022-02-24 7:49 ` Krzysztof Kozlowski 2022-02-24 7:49 ` Krzysztof Kozlowski 2022-02-24 23:52 ` Bjorn Helgaas 2022-02-24 23:52 ` Bjorn Helgaas 2022-02-24 23:52 ` Bjorn Helgaas 2022-02-24 23:52 ` Bjorn Helgaas 2022-02-25 9:36 ` Krzysztof Kozlowski 2022-02-25 9:36 ` Krzysztof Kozlowski 2022-02-25 9:36 ` Krzysztof Kozlowski 2022-02-25 17:13 ` Bjorn Helgaas 2022-02-25 17:13 ` Bjorn Helgaas 2022-02-25 17:13 ` Bjorn Helgaas 2022-02-25 17:13 ` Bjorn Helgaas 2022-02-23 19:13 ` [PATCH v2 06/11] s390: cio: " Krzysztof Kozlowski 2022-02-23 19:13 ` Krzysztof Kozlowski 2022-02-23 19:14 ` Krzysztof Kozlowski [this message] 2022-02-23 19:14 ` [PATCH v2 07/11] spi: " Krzysztof Kozlowski 2022-02-23 20:04 ` Mark Brown 2022-02-23 20:04 ` Mark Brown 2022-02-23 20:04 ` Mark Brown 2022-02-23 20:04 ` Mark Brown 2022-02-23 20:13 ` Krzysztof Kozlowski 2022-02-23 20:13 ` Krzysztof Kozlowski 2022-02-23 20:13 ` Krzysztof Kozlowski 2022-02-23 19:14 ` [PATCH v2 08/11] vdpa: " Krzysztof Kozlowski 2022-02-23 19:14 ` Krzysztof Kozlowski 2022-02-23 19:14 ` [PATCH v2 09/11] clk: imx: scu: fix kfree() of static memory on setting driver_override Krzysztof Kozlowski 2022-02-23 19:14 ` Krzysztof Kozlowski 2022-02-23 19:14 ` Krzysztof Kozlowski 2022-02-23 19:19 ` Krzysztof Kozlowski 2022-02-23 19:19 ` Krzysztof Kozlowski 2022-02-23 19:14 ` [PATCH v2 10/11] slimbus: qcom-ngd: " Krzysztof Kozlowski 2022-02-23 19:14 ` Krzysztof Kozlowski 2022-02-23 19:14 ` Krzysztof Kozlowski 2022-02-23 19:14 ` [PATCH v2 11/11] rpmsg: " Krzysztof Kozlowski 2022-02-23 19:14 ` Krzysztof Kozlowski 2022-02-23 19:14 ` Krzysztof Kozlowski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220223191441.348109-1-krzysztof.kozlowski@canonical.com \ --to=krzysztof.kozlowski@canonical.com \ --cc=abel.vesa@nxp.com \ --cc=agordeev@linux.ibm.com \ --cc=agross@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=bhelgaas@google.com \ --cc=bjorn.andersson@linaro.org \ --cc=borntraeger@linux.ibm.com \ --cc=broonie@kernel.org \ --cc=decui@microsoft.com \ --cc=festevam@gmail.com \ --cc=gor@linux.ibm.com \ --cc=gregkh@linuxfoundation.org \ --cc=haiyangz@microsoft.com \ --cc=hca@linux.ibm.com \ --cc=jasowang@redhat.com \ --cc=kys@microsoft.com \ --cc=laurentiu.tudor@nxp.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-hyperv@vger.kernel.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux-remoteproc@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=linux@rasmusvillemoes.dk \ --cc=mathieu.poirier@linaro.org \ --cc=mst@redhat.com \ --cc=oberpar@linux.ibm.com \ --cc=rafael@kernel.org \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ --cc=srinivas.kandagatla@linaro.org \ --cc=sthemmin@microsoft.com \ --cc=stuyoder@gmail.com \ --cc=svens@linux.ibm.com \ --cc=torvalds@linux-foundation.org \ --cc=virtualization@lists.linux-foundation.org \ --cc=vneethv@linux.ibm.com \ --cc=wei.liu@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.