Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1232689 > unrolled thread
| Started by | Grigoryev Denis <grigoryev@fastwel.ru> |
|---|---|
| First post | 2015-09-25 11:50 +0200 |
| Last post | 2015-09-25 18:30 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v4] mfd: tps6105x: Fix possible NULL pointer access. Grigoryev Denis <grigoryev@fastwel.ru> - 2015-09-25 11:50 +0200
Re: [PATCH v4] mfd: tps6105x: Fix possible NULL pointer access. Lee Jones <lee.jones@linaro.org> - 2015-09-25 18:30 +0200
| From | Grigoryev Denis <grigoryev@fastwel.ru> |
|---|---|
| Date | 2015-09-25 11:50 +0200 |
| Subject | [PATCH v4] mfd: tps6105x: Fix possible NULL pointer access. |
| Message-ID | <qcxND-60U-5@gated-at.bofh.it> |
dHBzNjEwNXggZHJpdmVyIHByb3ZpZGVzIHR3byBjZWxscy4gT25lIGlzIGZvciBHUElPIGFuZCBh bm90aGVyIG9uZSBpcwpmb3Igc2VsZWN0ZWQgbW9kZSBkZXBlbmRpbmcgb24gcGxhdGZvcm0gZGF0 YS4gV2hlbiB0cHM2MTA1eCBpcyB1c2VkIGluCkdQSU8tb25seSBtb2RlLCB0aGlzIGRyaXZlciBj YWxscyBtZmRfYWRkX2RldmljZXMoKSB3aXRoIG1mZF9jZWxsCi5uYW1lID09IE5VTEwuIFRoaXMg dmFsdWUgY2F1c2VzIGFuIG9vcHMgaW4gcGxhdGZvcm1fZGV2aWNlX3JlZ2lzdGVyKCkKbGF0ZXIu CgpUaGUgZm9sbG93aW5nIHBhdGNoIGFkZHMgYSBtZmRfY2VsbCBmb3IgZWFjaCBwb3NzaWJsZSBt b2RlIHRoZXJlYnkKZXhjbHVkaW5nIC5uYW1lIGFzc2lnbm1lbnQgaW4gcnVudGltZS4KClNpZ25l ZC1vZmYtYnk6IERlbmlzIEdyaWdvcnlldiA8Z3JpZ29yeWV2QGZhc3R3ZWwucnU+Ci0tLQogZHJp dmVycy9tZmQvdHBzNjEwNXguYyB8ICAgNzIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDMgaW5zZXJ0aW9ucygrKSwgMjkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZmQvdHBzNjEwNXguYyBiL2RyaXZl cnMvbWZkL3RwczYxMDV4LmMKaW5kZXggNWRlOTVjMi4uZjM0ZjE5ZCAxMDA2NDQKLS0tIGEvZHJp dmVycy9tZmQvdHBzNjEwNXguYworKysgYi9kcml2ZXJzL21mZC90cHM2MTA1eC5jCkBAIC0xMTks MjcgKzExOSw0NyBAQCBzdGF0aWMgaW50IHRwczYxMDV4X3N0YXJ0dXAoc3RydWN0IHRwczYxMDV4 ICp0cHM2MTA1eCkKIH0KIAogLyoKLSAqIE1GRCBjZWxscyAtIHdlIGhhdmUgb25lIGNlbGwgd2hp Y2ggaXMgc2VsZWN0ZWQgb3BlcmF0aW9uCi0gKiBtb2RlLCBhbmQgd2UgYWx3YXlzIGhhdmUgYSBH UElPIGNlbGwuCisgKiBNRkQgY2VsbHMgLSB3ZSBhbHdheXMgaGF2ZSBhIEdQSU8gY2VsbCBhbmQg d2UgaGF2ZSBvbmUgY2VsbAorICogd2hpY2ggaXMgc2VsZWN0ZWQgb3BlcmF0aW9uIG1vZGUuCiAg Ki8KLXN0YXRpYyBzdHJ1Y3QgbWZkX2NlbGwgdHBzNjEwNXhfY2VsbHNbXSA9IHsKLQl7Ci0JCS8q IG5hbWUgd2lsbCBiZSBydW50aW1lIGFzc2lnbmVkICovCi0JCS5pZCA9IC0xLAotCX0sCi0Jewot CQkubmFtZSA9ICJ0cHM2MTA1eC1ncGlvIiwKLQkJLmlkID0gLTEsCi0JfSwKK3N0YXRpYyBzdHJ1 Y3QgbWZkX2NlbGwgdHBzNjEwNXhfZGV2X2dwaW8gPSB7CisJLm5hbWUgPSAidHBzNjEwNXgtZ3Bp byIsCit9OworCitzdGF0aWMgc3RydWN0IG1mZF9jZWxsIHRwczYxMDV4X2Rldl9sZWRzID0gewor CS5uYW1lID0gInRwczYxMDV4LWxlZHMiLAorfTsKKworc3RhdGljIHN0cnVjdCBtZmRfY2VsbCB0 cHM2MTA1eF9kZXZfZmxhc2ggPSB7CisJLm5hbWUgPSAidHBzNjEwNXgtZmxhc2giLAogfTsKIAor c3RhdGljIHN0cnVjdCBtZmRfY2VsbCB0cHM2MTA1eF9kZXZfcmVndWxhdG9yID0geworCS5uYW1l ID0gInRwczYxMDV4LXJlZ3VsYXRvciIsCit9OworCitzdGF0aWMgaW50IHRwczYxMDV4X2FkZF9k ZXZpY2Uoc3RydWN0IHRwczYxMDV4ICp0cHM2MTA1eCwKKwkJCSAgICAgICBzdHJ1Y3QgbWZkX2Nl bGwgKmNlbGwpCit7CisJY2VsbC0+cGxhdGZvcm1fZGF0YSA9IHRwczYxMDV4OworCWNlbGwtPnBk YXRhX3NpemUgPSBzaXplb2YoKnRwczYxMDV4KTsKKworCXJldHVybiBtZmRfYWRkX2RldmljZXMo JnRwczYxMDV4LT5jbGllbnQtPmRldiwKKwkJCSAgICAgICBQTEFURk9STV9ERVZJRF9BVVRPLCBj ZWxsLCAxLCBOVUxMLCAwLCBOVUxMKTsKK30KKwogc3RhdGljIGludCB0cHM2MTA1eF9wcm9iZShz dHJ1Y3QgaTJjX2NsaWVudCAqY2xpZW50LAogCQkJY29uc3Qgc3RydWN0IGkyY19kZXZpY2VfaWQg KmlkKQogewogCXN0cnVjdCB0cHM2MTA1eAkJCSp0cHM2MTA1eDsKIAlzdHJ1Y3QgdHBzNjEwNXhf cGxhdGZvcm1fZGF0YQkqcGRhdGE7CiAJaW50IHJldDsKLQlpbnQgaTsKKworCXBkYXRhID0gZGV2 X2dldF9wbGF0ZGF0YSgmY2xpZW50LT5kZXYpOworCWlmIChwZGF0YSA9PSBOVUxMKSB7CisJCWRl dl9lcnIoJmNsaWVudC0+ZGV2LCAibWlzc2luZyBwbGF0Zm9ybSBkYXRhXG4iKTsKKwkJcmV0dXJu IC1FTk9ERVY7CisJfQogCiAJdHBzNjEwNXggPSBkZXZtX2ttYWxsb2MoJmNsaWVudC0+ZGV2LCBz aXplb2YoKnRwczYxMDV4KSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCF0cHM2MTA1eCkKQEAgLTE0Nyw3 ICsxNjcsNiBAQCBzdGF0aWMgaW50IHRwczYxMDV4X3Byb2JlKHN0cnVjdCBpMmNfY2xpZW50ICpj bGllbnQsCiAKIAlpMmNfc2V0X2NsaWVudGRhdGEoY2xpZW50LCB0cHM2MTA1eCk7CiAJdHBzNjEw NXgtPmNsaWVudCA9IGNsaWVudDsKLQlwZGF0YSA9IGRldl9nZXRfcGxhdGRhdGEoJmNsaWVudC0+ ZGV2KTsKIAl0cHM2MTA1eC0+cGRhdGEgPSBwZGF0YTsKIAltdXRleF9pbml0KCZ0cHM2MTA1eC0+ bG9jayk7CiAKQEAgLTE1NywzOCArMTc2LDMzIEBAIHN0YXRpYyBpbnQgdHBzNjEwNXhfcHJvYmUo c3RydWN0IGkyY19jbGllbnQgKmNsaWVudCwKIAkJcmV0dXJuIHJldDsKIAl9CiAKLQkvKiBSZW1v dmUgd2FybmluZyB0ZXh0cyB3aGVuIHlvdSBpbXBsZW1lbnQgbmV3IGNlbGwgZHJpdmVycyAqLwor CXJldCA9IHRwczYxMDV4X2FkZF9kZXZpY2UodHBzNjEwNXgsICZ0cHM2MTA1eF9kZXZfZ3Bpbyk7 CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwogCXN3aXRjaCAocGRhdGEtPm1vZGUpIHsKIAlj YXNlIFRQUzYxMDVYX01PREVfU0hVVERPV046CiAJCWRldl9pbmZvKCZjbGllbnQtPmRldiwKIAkJ CSAicHJlc2VudCwgbm90IHVzZWQgZm9yIGFueXRoaW5nLCBvbmx5IEdQSU9cbiIpOwogCQlicmVh azsKIAljYXNlIFRQUzYxMDVYX01PREVfVE9SQ0g6Ci0JCXRwczYxMDV4X2NlbGxzWzBdLm5hbWUg PSAidHBzNjEwNXgtbGVkcyI7Ci0JCWRldl93YXJuKCZjbGllbnQtPmRldiwKLQkJCSAidG9yY2gg bW9kZSBpcyB1bnN1cHBvcnRlZFxuIik7CisJCXJldCA9IHRwczYxMDV4X2FkZF9kZXZpY2UodHBz NjEwNXgsICZ0cHM2MTA1eF9kZXZfbGVkcyk7CiAJCWJyZWFrOwogCWNhc2UgVFBTNjEwNVhfTU9E RV9UT1JDSF9GTEFTSDoKLQkJdHBzNjEwNXhfY2VsbHNbMF0ubmFtZSA9ICJ0cHM2MTA1eC1mbGFz aCI7Ci0JCWRldl93YXJuKCZjbGllbnQtPmRldiwKLQkJCSAiZmxhc2ggbW9kZSBpcyB1bnN1cHBv cnRlZFxuIik7CisJCXJldCA9IHRwczYxMDV4X2FkZF9kZXZpY2UodHBzNjEwNXgsICZ0cHM2MTA1 eF9kZXZfZmxhc2gpOwogCQlicmVhazsKIAljYXNlIFRQUzYxMDVYX01PREVfVk9MVEFHRToKLQkJ dHBzNjEwNXhfY2VsbHNbMF0ubmFtZSA9InRwczYxMDV4LXJlZ3VsYXRvciI7CisJCXJldCA9IHRw czYxMDV4X2FkZF9kZXZpY2UodHBzNjEwNXgsICZ0cHM2MTA1eF9kZXZfcmVndWxhdG9yKTsKIAkJ 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 18:30 +0200 |
| Message-ID | <qcE2K-6GN-3@gated-at.bofh.it> |
| In reply to | #1232689 |
On Fri, 25 Sep 2015, Grigoryev Denis wrote:
> tps6105x 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(-)
>
> diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c
> index 5de95c2..f34f19d 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_dev_gpio = {
> + .name = "tps6105x-gpio",
> +};
> +
> +static struct mfd_cell tps6105x_dev_leds = {
> + .name = "tps6105x-leds",
> +};
> +
> +static struct mfd_cell tps6105x_dev_flash = {
> + .name = "tps6105x-flash",
> };
>
> +static struct mfd_cell tps6105x_dev_regulator = {
> + .name = "tps6105x-regulator",
> +};
Less confusing if you call these tps6105x_regulator_cell, etc.
> +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 == NULL) {
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_dev_gpio);
> + 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_dev_leds);
> 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_dev_flash);
> break;
> case TPS6105X_MODE_VOLTAGE:
> - tps6105x_cells[0].name ="tps6105x-regulator";
> + ret = tps6105x_add_device(tps6105x, &tps6105x_dev_regulator);
> 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);
If ret is non-zero, then mfd_add_devices() failed and there are no
device to remove.
> - 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