From: Beniamino Galvani <b.galvani@gmail.com> To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org> Cc: Wenyou Yang <wenyou.yang@atmel.com>, Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>, Mark Rutland <mark.rutland@arm.com>, Ian Campbell <ijc+devicetree@hellion.org.uk>, Kumar Gala <galak@codeaurora.org>, Heiko Stuebner <heiko@sntech.de>, devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Beniamino Galvani <b.galvani@gmail.com> Subject: [PATCH 1/5] regulator: act8865: fix parsing of platform data Date: Sun, 22 Jun 2014 17:31:41 +0200 [thread overview] Message-ID: <1403451105-31929-2-git-send-email-b.galvani@gmail.com> (raw) In-Reply-To: <1403451105-31929-1-git-send-email-b.galvani@gmail.com> The driver loops through all available regulators (ACT8865_REG_NUM) and accesses pdata->regulators[i].platform_data without checking the actual value of num_regulators in platform data, potentially causing a invalid memory access. Fix this and look up the regulator init_data by id in platform data. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> --- drivers/regulator/act8865-regulator.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index b92d7dd..fe2c038 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c @@ -252,6 +252,22 @@ static inline int act8865_pdata_from_dt(struct device *dev, } #endif +static struct regulator_init_data +*act8865_get_init_data(int id, struct act8865_platform_data *pdata) +{ + int i; + + if (!pdata) + return NULL; + + for (i = 0; i < pdata->num_regulators; i++) { + if (pdata->regulators[i].id == id) + return pdata->regulators[i].platform_data; + } + + return NULL; +} + static int act8865_pmic_probe(struct i2c_client *client, const struct i2c_device_id *i2c_id) { @@ -261,7 +277,7 @@ static int act8865_pmic_probe(struct i2c_client *client, struct regulator_config config = { }; struct act8865 *act8865; struct device_node *of_node[ACT8865_REG_NUM]; - int i, id; + int i; int ret = -EINVAL; int error; @@ -299,20 +315,17 @@ static int act8865_pmic_probe(struct i2c_client *client, /* Finally register devices */ for (i = 0; i < ACT8865_REG_NUM; i++) { - - id = pdata->regulators[i].id; + const struct regulator_desc *desc = &act8865_reg[i]; config.dev = dev; - config.init_data = pdata->regulators[i].platform_data; + config.init_data = act8865_get_init_data(desc->id, pdata); config.of_node = of_node[i]; config.driver_data = act8865; config.regmap = act8865->regmap; - rdev = devm_regulator_register(&client->dev, &act8865_reg[i], - &config); + rdev = devm_regulator_register(&client->dev, desc, &config); if (IS_ERR(rdev)) { - dev_err(dev, "failed to register %s\n", - act8865_reg[id].name); + dev_err(dev, "failed to register %s\n", desc->name); return PTR_ERR(rdev); } } -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: b.galvani@gmail.com (Beniamino Galvani) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/5] regulator: act8865: fix parsing of platform data Date: Sun, 22 Jun 2014 17:31:41 +0200 [thread overview] Message-ID: <1403451105-31929-2-git-send-email-b.galvani@gmail.com> (raw) In-Reply-To: <1403451105-31929-1-git-send-email-b.galvani@gmail.com> The driver loops through all available regulators (ACT8865_REG_NUM) and accesses pdata->regulators[i].platform_data without checking the actual value of num_regulators in platform data, potentially causing a invalid memory access. Fix this and look up the regulator init_data by id in platform data. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> --- drivers/regulator/act8865-regulator.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index b92d7dd..fe2c038 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c @@ -252,6 +252,22 @@ static inline int act8865_pdata_from_dt(struct device *dev, } #endif +static struct regulator_init_data +*act8865_get_init_data(int id, struct act8865_platform_data *pdata) +{ + int i; + + if (!pdata) + return NULL; + + for (i = 0; i < pdata->num_regulators; i++) { + if (pdata->regulators[i].id == id) + return pdata->regulators[i].platform_data; + } + + return NULL; +} + static int act8865_pmic_probe(struct i2c_client *client, const struct i2c_device_id *i2c_id) { @@ -261,7 +277,7 @@ static int act8865_pmic_probe(struct i2c_client *client, struct regulator_config config = { }; struct act8865 *act8865; struct device_node *of_node[ACT8865_REG_NUM]; - int i, id; + int i; int ret = -EINVAL; int error; @@ -299,20 +315,17 @@ static int act8865_pmic_probe(struct i2c_client *client, /* Finally register devices */ for (i = 0; i < ACT8865_REG_NUM; i++) { - - id = pdata->regulators[i].id; + const struct regulator_desc *desc = &act8865_reg[i]; config.dev = dev; - config.init_data = pdata->regulators[i].platform_data; + config.init_data = act8865_get_init_data(desc->id, pdata); config.of_node = of_node[i]; config.driver_data = act8865; config.regmap = act8865->regmap; - rdev = devm_regulator_register(&client->dev, &act8865_reg[i], - &config); + rdev = devm_regulator_register(&client->dev, desc, &config); if (IS_ERR(rdev)) { - dev_err(dev, "failed to register %s\n", - act8865_reg[id].name); + dev_err(dev, "failed to register %s\n", desc->name); return PTR_ERR(rdev); } } -- 1.7.10.4
next prev parent reply other threads:[~2014-06-22 15:33 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-06-22 15:31 [PATCH 0/5] regulator: act8865: add support for act8846 Beniamino Galvani 2014-06-22 15:31 ` Beniamino Galvani 2014-06-22 15:31 ` Beniamino Galvani [this message] 2014-06-22 15:31 ` [PATCH 1/5] regulator: act8865: fix parsing of platform data Beniamino Galvani 2014-06-23 9:45 ` Yang, Wenyou 2014-06-23 9:45 ` Yang, Wenyou 2014-06-23 9:45 ` Yang, Wenyou 2014-06-27 16:09 ` Mark Brown 2014-06-27 16:09 ` Mark Brown 2014-06-22 15:31 ` [PATCH 2/5] regulator: act8865: set correct number of regulators in pdata Beniamino Galvani 2014-06-22 15:31 ` Beniamino Galvani 2014-06-23 9:45 ` Yang, Wenyou 2014-06-23 9:45 ` Yang, Wenyou 2014-06-23 9:45 ` Yang, Wenyou 2014-06-27 16:07 ` Mark Brown 2014-06-27 16:07 ` Mark Brown 2014-06-29 9:46 ` Beniamino Galvani 2014-06-29 9:46 ` Beniamino Galvani 2014-06-29 9:46 ` Beniamino Galvani 2014-07-03 15:55 ` Mark Brown 2014-07-03 15:55 ` Mark Brown 2014-07-03 15:58 ` Mark Brown 2014-07-03 15:58 ` Mark Brown 2014-06-22 15:31 ` [PATCH 3/5] regulator: act8865: prepare support for other act88xx devices Beniamino Galvani 2014-06-22 15:31 ` Beniamino Galvani 2014-06-23 9:46 ` Yang, Wenyou 2014-06-23 9:46 ` Yang, Wenyou 2014-06-23 9:46 ` Yang, Wenyou 2014-07-03 16:00 ` Mark Brown 2014-07-03 16:00 ` Mark Brown 2014-06-22 15:31 ` [PATCH 4/5] regulator: act8865: add support for act8846 Beniamino Galvani 2014-06-22 15:31 ` Beniamino Galvani 2014-06-23 9:46 ` Yang, Wenyou 2014-06-23 9:46 ` Yang, Wenyou 2014-06-23 9:46 ` Yang, Wenyou 2014-06-22 15:31 ` [PATCH 5/5] regulator: act8865: add act8846 to DT binding documentation Beniamino Galvani 2014-06-22 15:31 ` Beniamino Galvani
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=1403451105-31929-2-git-send-email-b.galvani@gmail.com \ --to=b.galvani@gmail.com \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=galak@codeaurora.org \ --cc=heiko@sntech.de \ --cc=ijc+devicetree@hellion.org.uk \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=pawel.moll@arm.com \ --cc=robh+dt@kernel.org \ --cc=wenyou.yang@atmel.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.