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 v3 04/11] hv: Use driver_set_override() instead of open-coding Date: Sun, 27 Feb 2022 14:52:07 +0100 [thread overview] Message-ID: <20220227135214.145599-5-krzysztof.kozlowski@canonical.com> (raw) In-Reply-To: <20220227135214.145599-1-krzysztof.kozlowski@canonical.com> Use a helper for seting driver_override to reduce amount of duplicated code. Make the driver_override field const char, because it is not modified by the core and it matches other subsystems. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- drivers/hv/vmbus_drv.c | 28 ++++------------------------ include/linux/hyperv.h | 7 ++++++- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 12a2b37e87f3..a0ff4139c3d2 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -575,31 +575,11 @@ static ssize_t driver_override_store(struct device *dev, const char *buf, size_t count) { struct hv_device *hv_dev = device_to_hv_device(dev); - char *driver_override, *old, *cp; - - /* We need to keep extra room for a newline */ - if (count >= (PAGE_SIZE - 1)) - return -EINVAL; - - driver_override = kstrndup(buf, count, GFP_KERNEL); - if (!driver_override) - return -ENOMEM; - - cp = strchr(driver_override, '\n'); - if (cp) - *cp = '\0'; - - device_lock(dev); - old = hv_dev->driver_override; - if (strlen(driver_override)) { - hv_dev->driver_override = driver_override; - } else { - kfree(driver_override); - hv_dev->driver_override = NULL; - } - device_unlock(dev); + int ret; - kfree(old); + ret = driver_set_override(dev, &hv_dev->driver_override, buf, count); + if (ret) + return ret; return count; } diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index fe2e0179ed51..beea11874be2 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1257,7 +1257,12 @@ struct hv_device { u16 device_id; struct device device; - char *driver_override; /* Driver name to force a match */ + /* + * Driver name to force a match. + * Do not set directly, because core frees it. + * Use driver_set_override() to set or clear it. + */ + const char *driver_override; struct vmbus_channel *channel; struct kset *channels_kset; -- 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 v3 04/11] hv: Use driver_set_override() instead of open-coding Date: Sun, 27 Feb 2022 14:52:07 +0100 [thread overview] Message-ID: <20220227135214.145599-5-krzysztof.kozlowski@canonical.com> (raw) In-Reply-To: <20220227135214.145599-1-krzysztof.kozlowski@canonical.com> Use a helper for seting driver_override to reduce amount of duplicated code. Make the driver_override field const char, because it is not modified by the core and it matches other subsystems. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- drivers/hv/vmbus_drv.c | 28 ++++------------------------ include/linux/hyperv.h | 7 ++++++- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 12a2b37e87f3..a0ff4139c3d2 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -575,31 +575,11 @@ static ssize_t driver_override_store(struct device *dev, const char *buf, size_t count) { struct hv_device *hv_dev = device_to_hv_device(dev); - char *driver_override, *old, *cp; - - /* We need to keep extra room for a newline */ - if (count >= (PAGE_SIZE - 1)) - return -EINVAL; - - driver_override = kstrndup(buf, count, GFP_KERNEL); - if (!driver_override) - return -ENOMEM; - - cp = strchr(driver_override, '\n'); - if (cp) - *cp = '\0'; - - device_lock(dev); - old = hv_dev->driver_override; - if (strlen(driver_override)) { - hv_dev->driver_override = driver_override; - } else { - kfree(driver_override); - hv_dev->driver_override = NULL; - } - device_unlock(dev); + int ret; - kfree(old); + ret = driver_set_override(dev, &hv_dev->driver_override, buf, count); + if (ret) + return ret; return count; } diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index fe2e0179ed51..beea11874be2 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1257,7 +1257,12 @@ struct hv_device { u16 device_id; struct device device; - char *driver_override; /* Driver name to force a match */ + /* + * Driver name to force a match. + * Do not set directly, because core frees it. + * Use driver_set_override() to set or clear it. + */ + const char *driver_override; struct vmbus_channel *channel; struct kset *channels_kset; -- 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-27 13:53 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-27 13:52 [PATCH v3 00/11] Fix broken usage of driver_override (and kfree of static memory) Krzysztof Kozlowski 2022-02-27 13:52 ` Krzysztof Kozlowski 2022-02-27 13:52 ` [PATCH v3 01/11] driver: platform: Add helper for safer setting of driver_override Krzysztof Kozlowski 2022-02-27 13:52 ` Krzysztof Kozlowski 2022-02-28 10:51 ` Abel Vesa 2022-02-28 10:51 ` Abel Vesa 2022-02-28 10:51 ` Abel Vesa 2022-02-28 11:30 ` Krzysztof Kozlowski 2022-02-28 11:30 ` Krzysztof Kozlowski 2022-02-28 11:30 ` Krzysztof Kozlowski 2022-02-28 11:56 ` Abel Vesa 2022-02-28 11:56 ` Abel Vesa 2022-02-28 11:56 ` Abel Vesa 2022-02-28 20:03 ` Bjorn Helgaas 2022-02-28 20:03 ` Bjorn Helgaas 2022-02-28 20:03 ` Bjorn Helgaas 2022-02-28 20:03 ` Bjorn Helgaas 2022-03-01 8:49 ` Krzysztof Kozlowski 2022-03-01 8:49 ` Krzysztof Kozlowski 2022-03-01 8:49 ` Krzysztof Kozlowski 2022-02-27 13:52 ` [PATCH v3 02/11] amba: Use driver_set_override() instead of open-coding Krzysztof Kozlowski 2022-02-27 13:52 ` Krzysztof Kozlowski 2022-02-27 13:52 ` [PATCH v3 03/11] fsl-mc: " Krzysztof Kozlowski 2022-02-27 13:52 ` Krzysztof Kozlowski 2022-02-27 13:52 ` Krzysztof Kozlowski [this message] 2022-02-27 13:52 ` [PATCH v3 04/11] hv: " Krzysztof Kozlowski 2022-02-27 15:53 ` Michael Kelley (LINUX) 2022-02-27 15:53 ` Michael Kelley (LINUX) 2022-02-27 15:53 ` Michael Kelley (LINUX) via Virtualization 2022-02-27 13:52 ` [PATCH v3 05/11] PCI: " Krzysztof Kozlowski 2022-02-27 13:52 ` Krzysztof Kozlowski 2022-02-28 20:06 ` Bjorn Helgaas 2022-02-28 20:06 ` Bjorn Helgaas 2022-02-28 20:06 ` Bjorn Helgaas 2022-02-28 20:06 ` Bjorn Helgaas 2022-03-01 8:41 ` Krzysztof Kozlowski 2022-03-01 8:41 ` Krzysztof Kozlowski 2022-03-01 8:41 ` Krzysztof Kozlowski 2022-02-27 13:52 ` [PATCH v3 06/11] s390: cio: " Krzysztof Kozlowski 2022-02-27 13:52 ` Krzysztof Kozlowski 2022-03-01 16:01 ` Vineeth Vijayan 2022-03-01 16:01 ` Vineeth Vijayan 2022-03-02 11:01 ` Krzysztof Kozlowski 2022-03-02 11:01 ` Krzysztof Kozlowski 2022-02-27 13:53 ` [PATCH v3 07/11] spi: Use helper for safer setting of driver_override Krzysztof Kozlowski 2022-02-27 13:53 ` Krzysztof Kozlowski 2022-02-28 13:07 ` Mark Brown 2022-02-28 13:07 ` Mark Brown 2022-02-28 13:07 ` Mark Brown 2022-02-28 13:07 ` Mark Brown 2022-02-27 13:53 ` [PATCH v3 08/11] vdpa: " Krzysztof Kozlowski 2022-02-27 13:53 ` Krzysztof Kozlowski 2022-02-27 13:53 ` [PATCH v3 09/11] clk: imx: scu: Fix kfree() of static memory on setting driver_override Krzysztof Kozlowski 2022-02-27 13:53 ` Krzysztof Kozlowski 2022-02-27 13:53 ` Krzysztof Kozlowski 2022-02-28 10:55 ` Abel Vesa 2022-02-28 10:55 ` Abel Vesa 2022-02-28 10:55 ` Abel Vesa 2022-02-27 13:53 ` [PATCH v3 10/11] slimbus: qcom-ngd: " Krzysztof Kozlowski 2022-02-27 13:53 ` Krzysztof Kozlowski 2022-02-27 13:53 ` Krzysztof Kozlowski 2022-03-01 17:28 ` Srinivas Kandagatla 2022-03-01 17:28 ` Srinivas Kandagatla 2022-02-27 13:53 ` [PATCH v3 11/11] rpmsg: " Krzysztof Kozlowski 2022-02-27 13:53 ` Krzysztof Kozlowski 2022-02-27 13:53 ` Krzysztof Kozlowski 2022-03-11 20:19 ` Bjorn Andersson 2022-03-11 20:19 ` Bjorn Andersson 2022-03-11 20:19 ` Bjorn Andersson 2022-03-11 20:19 ` Bjorn Andersson
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=20220227135214.145599-5-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.