Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1232944 > unrolled thread
| Started by | Grigoryev Denis <grigoryev@fastwel.ru> |
|---|---|
| First post | 2015-09-25 19:00 +0200 |
| Last post | 2015-09-25 19:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v5] mfd: tps6105x: Fix possible NULL pointer access. Grigoryev Denis <grigoryev@fastwel.ru> - 2015-09-25 19:00 +0200
Re: [PATCH v5] mfd: tps6105x: Fix possible NULL pointer access. Lee Jones <lee.jones@linaro.org> - 2015-09-25 19:10 +0200
| From | Grigoryev Denis <grigoryev@fastwel.ru> |
|---|---|
| Date | 2015-09-25 19:00 +0200 |
| Subject | [PATCH v5] mfd: tps6105x: Fix possible NULL pointer access. |
| Message-ID | <qcEvM-7fp-13@gated-at.bofh.it> |
dHBzNjEwNSBkcml2ZXIgcHJvdmlkZXMgdHdvIGNlbGxzLiBPbmUgaXMgZm9yIEdQSU8gYW5kIGFu b3RoZXIgb25lIGlzCmZvciBzZWxlY3RlZCBtb2RlIGRlcGVuZGluZyBvbiBwbGF0Zm9ybSBkYXRh LiBXaGVuIHRwczYxMDV4IGlzIHVzZWQgaW4KR1BJTy1vbmx5IG1vZGUsIHRoaXMgZHJpdmVyIGNh bGxzIG1mZF9hZGRfZGV2aWNlcygpIHdpdGggbWZkX2NlbGwKLm5hbWUgPT0gTlVMTC4gVGhpcyB2 YWx1ZSBjYXVzZXMgYW4gb29wcyBpbiBwbGF0Zm9ybV9kZXZpY2VfcmVnaXN0ZXIoKQpsYXRlci4K ClRoZSBmb2xsb3dpbmcgcGF0Y2ggYWRkcyBhIG1mZF9jZWxsIGZvciBlYWNoIHBvc3NpYmxlIG1v ZGUgdGhlcmVieQpleGNsdWRpbmcgLm5hbWUgYXNzaWdubWVudCBpbiBydW50aW1lLgoKU2lnbmVk LW9mZi1ieTogRGVuaXMgR3JpZ29yeWV2IDxncmlnb3J5ZXZAZmFzdHdlbC5ydT4KLS0tCiBkcml2 ZXJzL21mZC90cHM2MTA1eC5jIHwgICA3MiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspLCAyOSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL21mZC90cHM2MTA1eC5jIGIvZHJpdmVy cy9tZmQvdHBzNjEwNXguYwppbmRleCA1ZGU5NWMyLi4xODJlYmUwIDEwMDY0NAotLS0gYS9kcml2 ZXJzL21mZC90cHM2MTA1eC5jCisrKyBiL2RyaXZlcnMvbWZkL3RwczYxMDV4LmMKQEAgLTExOSwy NyArMTE5LDQ3IEBAIHN0YXRpYyBpbnQgdHBzNjEwNXhfc3RhcnR1cChzdHJ1Y3QgdHBzNjEwNXgg KnRwczYxMDV4KQogfQogCiAvKgotICogTUZEIGNlbGxzIC0gd2UgaGF2ZSBvbmUgY2VsbCB3aGlj aCBpcyBzZWxlY3RlZCBvcGVyYXRpb24KLSAqIG1vZGUsIGFuZCB3ZSBhbHdheXMgaGF2ZSBhIEdQ SU8gY2VsbC4KKyAqIE1GRCBjZWxscyAtIHdlIGFsd2F5cyBoYXZlIGEgR1BJTyBjZWxsIGFuZCB3 ZSBoYXZlIG9uZSBjZWxsCisgKiB3aGljaCBpcyBzZWxlY3RlZCBvcGVyYXRpb24gbW9kZS4KICAq Lwotc3RhdGljIHN0cnVjdCBtZmRfY2VsbCB0cHM2MTA1eF9jZWxsc1tdID0gewotCXsKLQkJLyog bmFtZSB3aWxsIGJlIHJ1bnRpbWUgYXNzaWduZWQgKi8KLQkJLmlkID0gLTEsCi0JfSwKLQl7Ci0J CS5uYW1lID0gInRwczYxMDV4LWdwaW8iLAotCQkuaWQgPSAtMSwKLQl9LAorc3RhdGljIHN0cnVj dCBtZmRfY2VsbCB0cHM2MTA1eF9ncGlvX2NlbGwgPSB7CisJLm5hbWUgPSAidHBzNjEwNXgtZ3Bp byIsCit9OworCitzdGF0aWMgc3RydWN0IG1mZF9jZWxsIHRwczYxMDV4X2xlZHNfY2VsbCA9IHsK KwkubmFtZSA9ICJ0cHM2MTA1eC1sZWRzIiwKK307CisKK3N0YXRpYyBzdHJ1Y3QgbWZkX2NlbGwg dHBzNjEwNXhfZmxhc2hfY2VsbCA9IHsKKwkubmFtZSA9ICJ0cHM2MTA1eC1mbGFzaCIsCiB9Owog CitzdGF0aWMgc3RydWN0IG1mZF9jZWxsIHRwczYxMDV4X3JlZ3VsYXRvcl9jZWxsID0geworCS5u YW1lID0gInRwczYxMDV4LXJlZ3VsYXRvciIsCit9OworCitzdGF0aWMgaW50IHRwczYxMDV4X2Fk ZF9kZXZpY2Uoc3RydWN0IHRwczYxMDV4ICp0cHM2MTA1eCwKKwkJCSAgICAgICBzdHJ1Y3QgbWZk X2NlbGwgKmNlbGwpCit7CisJY2VsbC0+cGxhdGZvcm1fZGF0YSA9IHRwczYxMDV4OworCWNlbGwt PnBkYXRhX3NpemUgPSBzaXplb2YoKnRwczYxMDV4KTsKKworCXJldHVybiBtZmRfYWRkX2Rldmlj ZXMoJnRwczYxMDV4LT5jbGllbnQtPmRldiwKKwkJCSAgICAgICBQTEFURk9STV9ERVZJRF9BVVRP LCBjZWxsLCAxLCBOVUxMLCAwLCBOVUxMKTsKK30KKwogc3RhdGljIGludCB0cHM2MTA1eF9wcm9i ZShzdHJ1Y3QgaTJjX2NsaWVudCAqY2xpZW50LAogCQkJY29uc3Qgc3RydWN0IGkyY19kZXZpY2Vf aWQgKmlkKQogewogCXN0cnVjdCB0cHM2MTA1eAkJCSp0cHM2MTA1eDsKIAlzdHJ1Y3QgdHBzNjEw NXhfcGxhdGZvcm1fZGF0YQkqcGRhdGE7CiAJaW50IHJldDsKLQlpbnQgaTsKKworCXBkYXRhID0g ZGV2X2dldF9wbGF0ZGF0YSgmY2xpZW50LT5kZXYpOworCWlmICghcGRhdGEpIHsKKwkJZGV2X2Vy cigmY2xpZW50LT5kZXYsICJtaXNzaW5nIHBsYXRmb3JtIGRhdGFcbiIpOworCQlyZXR1cm4gLUVO T0RFVjsKKwl9CiAKIAl0cHM2MTA1eCA9IGRldm1fa21hbGxvYygmY2xpZW50LT5kZXYsIHNpemVv ZigqdHBzNjEwNXgpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIXRwczYxMDV4KQpAQCAtMTQ3LDcgKzE2 Nyw2IEBAIHN0YXRpYyBpbnQgdHBzNjEwNXhfcHJvYmUoc3RydWN0IGkyY19jbGllbnQgKmNsaWVu dCwKIAogCWkyY19zZXRfY2xpZW50ZGF0YShjbGllbnQsIHRwczYxMDV4KTsKIAl0cHM2MTA1eC0+ Y2xpZW50ID0gY2xpZW50OwotCXBkYXRhID0gZGV2X2dldF9wbGF0ZGF0YSgmY2xpZW50LT5kZXYp OwogCXRwczYxMDV4LT5wZGF0YSA9IHBkYXRhOwogCW11dGV4X2luaXQoJnRwczYxMDV4LT5sb2Nr KTsKIApAQCAtMTU3LDM4ICsxNzYsMzMgQEAgc3RhdGljIGludCB0cHM2MTA1eF9wcm9iZShzdHJ1 Y3QgaTJjX2NsaWVudCAqY2xpZW50LAogCQlyZXR1cm4gcmV0OwogCX0KIAotCS8qIFJlbW92ZSB3 YXJuaW5nIHRleHRzIHdoZW4geW91IGltcGxlbWVudCBuZXcgY2VsbCBkcml2ZXJzICovCisJcmV0 ID0gdHBzNjEwNXhfYWRkX2RldmljZSh0cHM2MTA1eCwgJnRwczYxMDV4X2dwaW9fY2VsbCk7CisJ aWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwogCXN3aXRjaCAocGRhdGEtPm1vZGUpIHsKIAljYXNl IFRQUzYxMDVYX01PREVfU0hVVERPV046CiAJCWRldl9pbmZvKCZjbGllbnQtPmRldiwKIAkJCSAi cHJlc2VudCwgbm90IHVzZWQgZm9yIGFueXRoaW5nLCBvbmx5IEdQSU9cbiIpOwogCQlicmVhazsK IAljYXNlIFRQUzYxMDVYX01PREVfVE9SQ0g6Ci0JCXRwczYxMDV4X2NlbGxzWzBdLm5hbWUgPSAi dHBzNjEwNXgtbGVkcyI7Ci0JCWRldl93YXJuKCZjbGllbnQtPmRldiwKLQkJCSAidG9yY2ggbW9k ZSBpcyB1bnN1cHBvcnRlZFxuIik7CisJCXJldCA9IHRwczYxMDV4X2FkZF9kZXZpY2UodHBzNjEw NXgsICZ0cHM2MTA1eF9sZWRzX2NlbGwpOwogCQlicmVhazsKIAljYXNlIFRQUzYxMDVYX01PREVf VE9SQ0hfRkxBU0g6Ci0JCXRwczYxMDV4X2NlbGxzWzBdLm5hbWUgPSAidHBzNjEwNXgtZmxhc2gi OwotCQlkZXZfd2FybigmY2xpZW50LT5kZXYsCi0JCQkgImZsYXNoIG1vZGUgaXMgdW5zdXBwb3J0 ZWRcbiIpOworCQlyZXQgPSB0cHM2MTA1eF9hZGRfZGV2aWNlKHRwczYxMDV4LCAmdHBzNjEwNXhf Zmxhc2hfY2VsbCk7CiAJCWJyZWFrOwogCWNhc2UgVFBTNjEwNVhfTU9ERV9WT0xUQUdFOgotCQl0 cHM2MTA1eF9jZWxsc1swXS5uYW1lID0idHBzNjEwNXgtcmVndWxhdG9yIjsKKwkJcmV0ID0gdHBz NjEwNXhfYWRkX2RldmljZSh0cHM2MTA1eCwgJnRwczYxMDV4X3JlZ3VsYXRvcl9jZWxsKTsKIAkJ YnJlYWs7CiAJZGVmYXVsdDoKKwkJZGV2X3dhcm4oJmNsaWVudC0+ZGV2LCAiaW52YWxpZCBtb2Rl OiAlZFxuIiwgcGRhdGEtPm1vZGUpOwogCQlicmVhazsKIAl9CiAKLQkvKiBTZXQgdXAgYW5kIHJl Z2lzdGVyIHRoZSBwbGF0Zm9ybSBkZXZpY2VzLiAqLwotCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9T SVpFKHRwczYxMDV4X2NlbGxzKTsgaSsrKSB7Ci0JCS8qIE9uZSBzdGF0ZSBob2xkZXIgZm9yIGFs bCBkcml2ZXJzLCB0aGlzIGlzIHNpbXBsZSAqLwotCQl0cHM2MTA1eF9jZWxsc1tpXS5wbGF0Zm9y bV9kYXRhID0gdHBzNjEwNXg7Ci0JCXRwczYxMDV4X2NlbGxzW2ldLnBkYXRhX3NpemUgPSBzaXpl b2YoKnRwczYxMDV4KTsKLQl9CisJaWYgKHJldCkKKwkJbWZkX3JlbW92ZV9kZXZpY2VzKCZjbGll bnQtPmRldik7CiAKLQlyZXR1cm4gbWZkX2FkZF9kZXZpY2VzKCZjbGllbnQtPmRldiwgMCwgdHBz NjEwNXhfY2VsbHMsCi0JCQkgICAgICAgQVJSQVlfU0laRSh0cHM2MTA1eF9jZWxscyksIE5VTEws IDAsIE5VTEwpOworCXJldHVybiByZXQ7CiB9CiAKIHN0YXRpYyBpbnQgdHBzNjEwNXhfcmVtb3Zl KHN0cnVjdCBpMmNfY2xpZW50ICpjbGllbnQpCi0tIAoxLjcuMTAuNAoK -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Lee Jones <lee.jones@linaro.org> |
|---|---|
| Date | 2015-09-25 19:10 +0200 |
| Message-ID | <qcEFs-7G2-15@gated-at.bofh.it> |
| In reply to | #1232944 |
On Fri, 25 Sep 2015, Grigoryev Denis wrote:
> tps6105 driver provides two cells. One is for GPIO and another one is
> for selected mode depending on platform data. When tps6105x is used in
> GPIO-only mode, this driver calls mfd_add_devices() with mfd_cell
> .name == NULL. This value causes an oops in platform_device_register()
> later.
>
> The following patch adds a mfd_cell for each possible mode thereby
> excluding .name assignment in runtime.
>
> Signed-off-by: Denis Grigoryev <grigoryev@fastwel.ru>
> ---
> drivers/mfd/tps6105x.c | 72 +++++++++++++++++++++++++++++-------------------
> 1 file changed, 43 insertions(+), 29 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c
> index 5de95c2..182ebe0 100644
> --- a/drivers/mfd/tps6105x.c
> +++ b/drivers/mfd/tps6105x.c
> @@ -119,27 +119,47 @@ static int tps6105x_startup(struct tps6105x *tps6105x)
> }
>
> /*
> - * MFD cells - we have one cell which is selected operation
> - * mode, and we always have a GPIO cell.
> + * MFD cells - we always have a GPIO cell and we have one cell
> + * which is selected operation mode.
> */
> -static struct mfd_cell tps6105x_cells[] = {
> - {
> - /* name will be runtime assigned */
> - .id = -1,
> - },
> - {
> - .name = "tps6105x-gpio",
> - .id = -1,
> - },
> +static struct mfd_cell tps6105x_gpio_cell = {
> + .name = "tps6105x-gpio",
> +};
> +
> +static struct mfd_cell tps6105x_leds_cell = {
> + .name = "tps6105x-leds",
> +};
> +
> +static struct mfd_cell tps6105x_flash_cell = {
> + .name = "tps6105x-flash",
> };
>
> +static struct mfd_cell tps6105x_regulator_cell = {
> + .name = "tps6105x-regulator",
> +};
> +
> +static int tps6105x_add_device(struct tps6105x *tps6105x,
> + struct mfd_cell *cell)
> +{
> + cell->platform_data = tps6105x;
> + cell->pdata_size = sizeof(*tps6105x);
> +
> + return mfd_add_devices(&tps6105x->client->dev,
> + PLATFORM_DEVID_AUTO, cell, 1, NULL, 0, NULL);
> +}
> +
> static int tps6105x_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> struct tps6105x *tps6105x;
> struct tps6105x_platform_data *pdata;
> int ret;
> - int i;
> +
> + pdata = dev_get_platdata(&client->dev);
> + if (!pdata) {
> + dev_err(&client->dev, "missing platform data\n");
> + return -ENODEV;
> + }
>
> tps6105x = devm_kmalloc(&client->dev, sizeof(*tps6105x), GFP_KERNEL);
> if (!tps6105x)
> @@ -147,7 +167,6 @@ static int tps6105x_probe(struct i2c_client *client,
>
> i2c_set_clientdata(client, tps6105x);
> tps6105x->client = client;
> - pdata = dev_get_platdata(&client->dev);
> tps6105x->pdata = pdata;
> mutex_init(&tps6105x->lock);
>
> @@ -157,38 +176,33 @@ static int tps6105x_probe(struct i2c_client *client,
> return ret;
> }
>
> - /* Remove warning texts when you implement new cell drivers */
> + ret = tps6105x_add_device(tps6105x, &tps6105x_gpio_cell);
> + if (ret)
> + return ret;
> +
> switch (pdata->mode) {
> case TPS6105X_MODE_SHUTDOWN:
> dev_info(&client->dev,
> "present, not used for anything, only GPIO\n");
> break;
> case TPS6105X_MODE_TORCH:
> - tps6105x_cells[0].name = "tps6105x-leds";
> - dev_warn(&client->dev,
> - "torch mode is unsupported\n");
> + ret = tps6105x_add_device(tps6105x, &tps6105x_leds_cell);
> break;
> case TPS6105X_MODE_TORCH_FLASH:
> - tps6105x_cells[0].name = "tps6105x-flash";
> - dev_warn(&client->dev,
> - "flash mode is unsupported\n");
> + ret = tps6105x_add_device(tps6105x, &tps6105x_flash_cell);
> break;
> case TPS6105X_MODE_VOLTAGE:
> - tps6105x_cells[0].name ="tps6105x-regulator";
> + ret = tps6105x_add_device(tps6105x, &tps6105x_regulator_cell);
> break;
> default:
> + dev_warn(&client->dev, "invalid mode: %d\n", pdata->mode);
> break;
> }
>
> - /* Set up and register the platform devices. */
> - for (i = 0; i < ARRAY_SIZE(tps6105x_cells); i++) {
> - /* One state holder for all drivers, this is simple */
> - tps6105x_cells[i].platform_data = tps6105x;
> - tps6105x_cells[i].pdata_size = sizeof(*tps6105x);
> - }
> + if (ret)
> + mfd_remove_devices(&client->dev);
>
> - return mfd_add_devices(&client->dev, 0, tps6105x_cells,
> - ARRAY_SIZE(tps6105x_cells), NULL, 0, NULL);
> + return ret;
> }
>
> static int tps6105x_remove(struct i2c_client *client)
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web