Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1229582 > unrolled thread

[PATCH v3] mfd: tps6105x: Fix NULL pointer access.

Started byGrigoryev Denis <grigoryev@fastwel.ru>
First post2015-09-21 19:20 +0200
Last post2015-09-23 02:30 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v3] mfd: tps6105x: Fix NULL pointer access. Grigoryev Denis <grigoryev@fastwel.ru> - 2015-09-21 19:20 +0200
    Re: [PATCH v3] mfd: tps6105x: Fix NULL pointer access. Lee Jones <lee.jones@linaro.org> - 2015-09-23 02:30 +0200

#1229582 — [PATCH v3] mfd: tps6105x: Fix NULL pointer access.

FromGrigoryev Denis <grigoryev@fastwel.ru>
Date2015-09-21 19:20 +0200
Subject[PATCH v3] mfd: tps6105x: Fix NULL pointer access.
Message-ID<qbcUW-4Fd-15@gated-at.bofh.it>
V2hlbiB0cHM2MTA1eCB1c2VkIGluIFRQUzYxMDVYX01PREVfU0hVVERPV04gbW9kZSB0aGUgZHJp
dmVyIGNhbGxzCm1mZF9hZGRfZGV2aWNlcygpIHdpdGggbWZkX2NlbGwtPm5hbWUgPT0gTlVMTCwg
dGhhdCBjYXVzZXMgYW4gb29vcHMgaW4KcGxhdGZvcm1fZGV2aWNlX3JlZ2lzdGVyKCkgbGF0ZXIu
CgpUaGlzIHBhdGNoIGFkZHMgYW4gbWZkX2NlbGwgZm9yIGVhY2ggcG9zc2libGUgbW9kZSB0aGVy
ZWJ5IGV4Y2x1ZGluZwoubmFtZSBhc3NpZ25tZW50IGluIHJ1bnRpbWUuCgpTaWduZWQtb2ZmLWJ5
OiBEZW5pcyBHcmlnb3J5ZXYgPGdyaWdvcnlldkBmYXN0d2VsLnJ1PgotLS0KIGRyaXZlcnMvbWZk
L3RwczYxMDV4LmMgfCAgIDYxICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t
LS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9u
cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWZkL3RwczYxMDV4LmMgYi9kcml2ZXJzL21mZC90
cHM2MTA1eC5jCmluZGV4IDVkZTk1YzIuLjY2MDNmYzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbWZk
L3RwczYxMDV4LmMKKysrIGIvZHJpdmVycy9tZmQvdHBzNjEwNXguYwpAQCAtMTE5LDE3ICsxMTks
MjUgQEAgc3RhdGljIGludCB0cHM2MTA1eF9zdGFydHVwKHN0cnVjdCB0cHM2MTA1eCAqdHBzNjEw
NXgpCiB9CiAKIC8qCi0gKiBNRkQgY2VsbHMgLSB3ZSBoYXZlIG9uZSBjZWxsIHdoaWNoIGlzIHNl
bGVjdGVkIG9wZXJhdGlvbgotICogbW9kZSwgYW5kIHdlIGFsd2F5cyBoYXZlIGEgR1BJTyBjZWxs
LgorICogTUZEIGNlbGxzIC0gd2UgYWx3YXlzIGhhdmUgYSBHUElPIGNlbGwgYW5kIHdlIGhhdmUg
b25lIGNlbGwKKyAqIHdoaWNoIGlzIHNlbGVjdGVkIG9wZXJhdGlvbiBtb2RlLgogICovCiBzdGF0
aWMgc3RydWN0IG1mZF9jZWxsIHRwczYxMDV4X2NlbGxzW10gPSB7Ci0JewotCQkvKiBuYW1lIHdp
bGwgYmUgcnVudGltZSBhc3NpZ25lZCAqLwotCQkuaWQgPSAtMSwKKwlbVFBTNjEwNVhfTU9ERV9T
SFVURE9XTl0JPSB7CisJCS5uYW1lCQkJPSAidHBzNjEwNXgtZ3BpbyIsCisJCS5pZAkJCT0gLTEs
CiAJfSwKLQl7Ci0JCS5uYW1lID0gInRwczYxMDV4LWdwaW8iLAotCQkuaWQgPSAtMSwKKwlbVFBT
NjEwNVhfTU9ERV9UT1JDSF0JCT0geworCQkubmFtZQkJCT0gInRwczYxMDV4LWxlZHMiLAorCQku
aWQJCQk9IC0xLAorCX0sCisJW1RQUzYxMDVYX01PREVfVE9SQ0hfRkxBU0hdCT0geworCQkubmFt
ZQkJCT0gInRwczYxMDV4LWZsYXNoIiwKKwkJLmlkCQkJPSAtMSwKKwl9LAorCVtUUFM2MTA1WF9N
T0RFX1ZPTFRBR0VdCQk9IHsKKwkJLm5hbWUJCQk9ICJ0cHM2MTA1eC1yZWd1bGF0b3IiLAorCQku
aWQJCQk9IC0xLAogCX0sCiB9OwogCkBAIC0xNTcsMzggKzE2NSwzOSBAQCBzdGF0aWMgaW50IHRw
czYxMDV4X3Byb2JlKHN0cnVjdCBpMmNfY2xpZW50ICpjbGllbnQsCiAJCXJldHVybiByZXQ7CiAJ
fQogCi0JLyogUmVtb3ZlIHdhcm5pbmcgdGV4dHMgd2hlbiB5b3UgaW1wbGVtZW50IG5ldyBjZWxs
IGRyaXZlcnMgKi8KKwkvKiBTZXQgdXAgYW5kIHJlZ2lzdGVyIHRoZSBwbGF0Zm9ybSBkZXZpY2Vz
LiAqLworCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHRwczYxMDV4X2NlbGxzKTsgaSsrKSB7
CisJCS8qIE9uZSBzdGF0ZSBob2xkZXIgZm9yIGFsbCBkcml2ZXJzLCB0aGlzIGlzIHNpbXBsZSAq
LworCQl0cHM2MTA1eF9jZWxsc1tpXS5wbGF0Zm9ybV9kYXRhID0gdHBzNjEwNXg7CisJCXRwczYx
MDV4X2NlbGxzW2ldLnBkYXRhX3NpemUgPSBzaXplb2YoKnRwczYxMDV4KTsKKwl9CisKKwlyZXQg
PSBtZmRfYWRkX2RldmljZXMoJmNsaWVudC0+ZGV2LCAtMSwgdHBzNjEwNXhfY2VsbHMsCisJCQkg
ICAgICAxLCBOVUxMLCAwLCBOVUxMKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCiAJc3dp
dGNoIChwZGF0YS0+bW9kZSkgewogCWNhc2UgVFBTNjEwNVhfTU9ERV9TSFVURE9XTjoKIAkJZGV2
X2luZm8oJmNsaWVudC0+ZGV2LAogCQkJICJwcmVzZW50LCBub3QgdXNlZCBmb3IgYW55dGhpbmcs
IG9ubHkgR1BJT1xuIik7CiAJCWJyZWFrOwogCWNhc2UgVFBTNjEwNVhfTU9ERV9UT1JDSDoKLQkJ
dHBzNjEwNXhfY2VsbHNbMF0ubmFtZSA9ICJ0cHM2MTA1eC1sZWRzIjsKLQkJZGV2X3dhcm4oJmNs
aWVudC0+ZGV2LAotCQkJICJ0b3JjaCBtb2RlIGlzIHVuc3VwcG9ydGVkXG4iKTsKLQkJYnJlYWs7
CiAJY2FzZSBUUFM2MTA1WF9NT0RFX1RPUkNIX0ZMQVNIOgotCQl0cHM2MTA1eF9jZWxsc1swXS5u
YW1lID0gInRwczYxMDV4LWZsYXNoIjsKLQkJZGV2X3dhcm4oJmNsaWVudC0+ZGV2LAotCQkJICJm
bGFzaCBtb2RlIGlzIHVuc3VwcG9ydGVkXG4iKTsKLQkJYnJlYWs7CiAJY2FzZSBUUFM2MTA1WF9N
T0RFX1ZPTFRBR0U6Ci0JCXRwczYxMDV4X2NlbGxzWzBdLm5hbWUgPSJ0cHM2MTA1eC1yZWd1bGF0
b3IiOworCQlyZXQgPSBtZmRfYWRkX2RldmljZXMoJmNsaWVudC0+ZGV2LCAtMSwKKwkJCQkgICAg
ICAmdHBzNjEwNXhfY2VsbHNbcGRhdGEtPm1vZGVdLAorCQkJCSAgICAgIDEsIE5VTEwsIDAsIE5V
TEwpOwogCQlicmVhazsKIAlkZWZhdWx0OgorCQlkZXZfd2FybigmY2xpZW50LT5kZXYsICJpbnZh
bGlkIG1vZGU6ICVkXG4iLCBwZGF0YS0+bW9kZSk7CiAJCWJyZWFrOwogCX0KIAotCS8qIFNldCB1
cCBhbmQgcmVnaXN0ZXIgdGhlIHBsYXRmb3JtIGRldmljZXMuICovCi0JZm9yIChpID0gMDsgaSA8
IEFSUkFZX1NJWkUodHBzNjEwNXhfY2VsbHMpOyBpKyspIHsKLQkJLyogT25lIHN0YXRlIGhvbGRl
ciBmb3IgYWxsIGRyaXZlcnMsIHRoaXMgaXMgc2ltcGxlICovCi0JCXRwczYxMDV4X2NlbGxzW2ld
LnBsYXRmb3JtX2RhdGEgPSB0cHM2MTA1eDsKLQkJdHBzNjEwNXhfY2VsbHNbaV0ucGRhdGFfc2l6
ZSA9IHNpemVvZigqdHBzNjEwNXgpOwotCX0KKwlpZiAocmV0KQorCQltZmRfcmVtb3ZlX2Rldmlj
ZXMoJmNsaWVudC0+ZGV2KTsKIAotCXJldHVybiBtZmRfYWRkX2RldmljZXMoJmNsaWVudC0+ZGV2
LCAwLCB0cHM2MTA1eF9jZWxscywKLQkJCSAgICAgICBBUlJBWV9TSVpFKHRwczYxMDV4X2NlbGxz
KSwgTlVMTCwgMCwgTlVMTCk7CisJcmV0dXJuIHJldDsKIH0KIAogc3RhdGljIGludCB0cHM2MTA1
eF9yZW1vdmUoc3RydWN0IGkyY19jbGllbnQgKmNsaWVudCkKLS0gCjEuNy4xMC40Cg==
--
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]

#1231067

FromLee Jones <lee.jones@linaro.org>
Date2015-09-23 02:30 +0200
Message-ID<qbG6B-4AP-1@gated-at.bofh.it>
In reply to#1229582
On Mon, 21 Sep 2015, Grigoryev Denis wrote:

> When tps6105x used in TPS6105X_MODE_SHUTDOWN mode the driver calls
> mfd_add_devices() with mfd_cell->name == NULL, that causes an ooops in
> platform_device_register() later.
> 
> This patch adds an mfd_cell for each possible mode thereby excluding
> .name assignment in runtime.
> 
> Signed-off-by: Denis Grigoryev <grigoryev@fastwel.ru>
> ---
>  drivers/mfd/tps6105x.c |   61 +++++++++++++++++++++++++++---------------------
>  1 file changed, 35 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c
> index 5de95c2..6603fc8 100644
> --- a/drivers/mfd/tps6105x.c
> +++ b/drivers/mfd/tps6105x.c
> @@ -119,17 +119,25 @@ 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,
> +	[TPS6105X_MODE_SHUTDOWN]	= {
> +		.name			= "tps6105x-gpio",
> +		.id			= -1,
>  	},
> -	{
> -		.name = "tps6105x-gpio",
> -		.id = -1,
> +	[TPS6105X_MODE_TORCH]		= {
> +		.name			= "tps6105x-leds",
> +		.id			= -1,
> +	},
> +	[TPS6105X_MODE_TORCH_FLASH]	= {
> +		.name			= "tps6105x-flash",
> +		.id			= -1,
> +	},
> +	[TPS6105X_MODE_VOLTAGE]		= {
> +		.name			= "tps6105x-regulator",
> +		.id			= -1,

Why are these IDs all -1?

>  	},
>  };
>  
> @@ -157,38 +165,39 @@ static int tps6105x_probe(struct i2c_client *client,
>  		return ret;
>  	}
>  
> -	/* Remove warning texts when you implement new cell drivers */
> +	/* 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);
> +	}
> +
> +	ret = mfd_add_devices(&client->dev, -1, tps6105x_cells,
> +			      1, NULL, 0, NULL);
> +	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");
> -		break;
>  	case TPS6105X_MODE_TORCH_FLASH:
> -		tps6105x_cells[0].name = "tps6105x-flash";
> -		dev_warn(&client->dev,
> -			 "flash mode is unsupported\n");
> -		break;
>  	case TPS6105X_MODE_VOLTAGE:
> -		tps6105x_cells[0].name ="tps6105x-regulator";
> +		ret = mfd_add_devices(&client->dev, -1,
> +				      &tps6105x_cells[pdata->mode],
> +				      1, NULL, 0, NULL);
>  		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