From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> To: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org, vkoul@kernel.org, gregkh@linuxfoundation.org, jank@cadence.com, srinivas.kandagatla@linaro.org, slawomir.blauciak@intel.com, Bard liao <yung-chuan.liao@linux.intel.com>, Rander Wang <rander.wang@linux.intel.com>, Ranjani Sridharan <ranjani.sridharan@linux.intel.com>, Hui Wang <hui.wang@canonical.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Sanyog Kale <sanyog.r.kale@intel.com> Subject: [PATCH 2/5] soundwire: bus_type: protect cases where no driver name is provided Date: Fri, 20 Mar 2020 11:29:44 -0500 [thread overview] Message-ID: <20200320162947.17663-3-pierre-louis.bossart@linux.intel.com> (raw) In-Reply-To: <20200320162947.17663-1-pierre-louis.bossart@linux.intel.com> When the implementation only creates a sdw_master_device and does not provide a master_name, we have a risk of kernel oopses with dereferences of a NULL pointer. Protect with explicit tests. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- drivers/soundwire/bus_type.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index 09a25075e770..c01d74c709d5 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -48,12 +48,14 @@ static int sdw_bus_match(struct device *dev, struct device_driver *ddrv) md = dev_to_sdw_master_device(dev); mdrv = drv_to_sdw_master_driver(ddrv); - /* - * we don't have any hardware information so - * match with a hopefully unique string - */ - ret = !strncmp(md->master_name, mdrv->driver.name, - strlen(md->master_name)); + if (md->master_name) { + /* + * we don't have any hardware information so + * match with a hopefully unique string + */ + ret = !strncmp(md->master_name, mdrv->driver.name, + strlen(md->master_name)); + } } return ret; } @@ -71,9 +73,11 @@ static int sdw_master_modalias(const struct sdw_master_device *md, char *buf, size_t size) { /* modalias is sdw:<string> since we don't have any hardware info */ - - return snprintf(buf, size, "sdw:%s\n", - md->master_name); + if (md->master_name) + return snprintf(buf, size, "sdw:%s\n", + md->master_name); + else + return snprintf(buf, size, "sdw:no_master_driver\n"); } static int sdw_uevent(struct device *dev, struct kobj_uevent_env *env) -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> To: alsa-devel@alsa-project.org Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, tiwai@suse.de, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Ranjani Sridharan <ranjani.sridharan@linux.intel.com>, Hui Wang <hui.wang@canonical.com>, vkoul@kernel.org, broonie@kernel.org, srinivas.kandagatla@linaro.org, jank@cadence.com, slawomir.blauciak@intel.com, Sanyog Kale <sanyog.r.kale@intel.com>, Bard liao <yung-chuan.liao@linux.intel.com>, Rander Wang <rander.wang@linux.intel.com> Subject: [PATCH 2/5] soundwire: bus_type: protect cases where no driver name is provided Date: Fri, 20 Mar 2020 11:29:44 -0500 [thread overview] Message-ID: <20200320162947.17663-3-pierre-louis.bossart@linux.intel.com> (raw) In-Reply-To: <20200320162947.17663-1-pierre-louis.bossart@linux.intel.com> When the implementation only creates a sdw_master_device and does not provide a master_name, we have a risk of kernel oopses with dereferences of a NULL pointer. Protect with explicit tests. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- drivers/soundwire/bus_type.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index 09a25075e770..c01d74c709d5 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -48,12 +48,14 @@ static int sdw_bus_match(struct device *dev, struct device_driver *ddrv) md = dev_to_sdw_master_device(dev); mdrv = drv_to_sdw_master_driver(ddrv); - /* - * we don't have any hardware information so - * match with a hopefully unique string - */ - ret = !strncmp(md->master_name, mdrv->driver.name, - strlen(md->master_name)); + if (md->master_name) { + /* + * we don't have any hardware information so + * match with a hopefully unique string + */ + ret = !strncmp(md->master_name, mdrv->driver.name, + strlen(md->master_name)); + } } return ret; } @@ -71,9 +73,11 @@ static int sdw_master_modalias(const struct sdw_master_device *md, char *buf, size_t size) { /* modalias is sdw:<string> since we don't have any hardware info */ - - return snprintf(buf, size, "sdw:%s\n", - md->master_name); + if (md->master_name) + return snprintf(buf, size, "sdw:%s\n", + md->master_name); + else + return snprintf(buf, size, "sdw:no_master_driver\n"); } static int sdw_uevent(struct device *dev, struct kobj_uevent_env *env) -- 2.20.1
next prev parent reply other threads:[~2020-03-20 16:30 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-20 16:29 [PATCH 0/5] soundwire: add sdw_master_device support on Qualcomm platforms Pierre-Louis Bossart 2020-03-20 16:29 ` Pierre-Louis Bossart 2020-03-20 16:29 ` [PATCH 1/5] soundwire: bus_type: add master_device/driver support Pierre-Louis Bossart 2020-03-20 16:29 ` Pierre-Louis Bossart 2020-03-20 17:51 ` Srinivas Kandagatla 2020-03-20 17:51 ` Srinivas Kandagatla 2020-03-20 18:17 ` Pierre-Louis Bossart 2020-03-20 18:17 ` Pierre-Louis Bossart 2020-03-23 11:06 ` Srinivas Kandagatla 2020-03-23 11:06 ` Srinivas Kandagatla 2020-03-23 12:54 ` Vinod Koul 2020-03-23 12:54 ` Vinod Koul 2020-03-20 16:29 ` Pierre-Louis Bossart [this message] 2020-03-20 16:29 ` [PATCH 2/5] soundwire: bus_type: protect cases where no driver name is provided Pierre-Louis Bossart 2020-03-20 16:29 ` [PATCH 3/5] soundwire: master: use device node pointer from master device Pierre-Louis Bossart 2020-03-20 16:29 ` Pierre-Louis Bossart 2020-03-20 16:29 ` [PATCH 4/5] soundwire: qcom: fix error handling in probe Pierre-Louis Bossart 2020-03-20 16:29 ` Pierre-Louis Bossart 2020-03-20 16:29 ` [PATCH 5/5] soundwire: qcom: add sdw_master_device support Pierre-Louis Bossart 2020-03-20 16:29 ` Pierre-Louis Bossart 2020-03-20 17:01 ` Srinivas Kandagatla 2020-03-20 17:01 ` Srinivas Kandagatla 2020-03-20 17:57 ` Pierre-Louis Bossart 2020-03-23 12:52 ` Vinod Koul 2020-03-23 12:52 ` Vinod Koul
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=20200320162947.17663-3-pierre-louis.bossart@linux.intel.com \ --to=pierre-louis.bossart@linux.intel.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=hui.wang@canonical.com \ --cc=jank@cadence.com \ --cc=linux-kernel@vger.kernel.org \ --cc=rander.wang@linux.intel.com \ --cc=ranjani.sridharan@linux.intel.com \ --cc=sanyog.r.kale@intel.com \ --cc=slawomir.blauciak@intel.com \ --cc=srinivas.kandagatla@linaro.org \ --cc=tiwai@suse.de \ --cc=vkoul@kernel.org \ --cc=yung-chuan.liao@linux.intel.com \ /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.