[PATCH] i2c: brcmstb: allocate correct amount of memory for regmap

[PATCH] i2c: brcmstb: allocate correct amount of memory for regmap

[Wolfram Sang]

We want the size of the struct, not of a pointer to it. To be future
proof, just dereference the pointer to get the desired type.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
 drivers/i2c/busses/i2c-brcmstb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
index 3711df1d452622..4a45408dd82060 100644
--- a/drivers/i2c/busses/i2c-brcmstb.c
+++ b/drivers/i2c/busses/i2c-brcmstb.c
@@ -586,8 +586,7 @@ static int brcmstb_i2c_probe(struct platform_device *pdev)
 	if (!dev)
 		return -ENOMEM;
 
-	dev->bsc_regmap = devm_kzalloc(&pdev->dev, sizeof(struct bsc_regs *),
-				       GFP_KERNEL);
+	dev->bsc_regmap = devm_kzalloc(&pdev->dev, sizeof(*dev->bsc_regmap), GFP_KERNEL);
 	if (!dev->bsc_regmap)
 		return -ENOMEM;
 
-- 
2.7.0

Re: [PATCH] i2c: brcmstb: allocate correct amount of memory for regmap

[Gregory Fong]

On Sun, Feb 21, 2016 at 6:16 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
> We want the size of the struct, not of a pointer to it. To be future
> proof, just dereference the pointer to get the desired type.

This looks like it fixes like a fairly serious issue: before this
change, the driver may modify memory that wasn't allocated for this
struct.  Shouldn't this also have Cc: stable?

>
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

Acked-by: Gregory Fong <gregory.0xf0@gmail.com>

Re: [PATCH] i2c: brcmstb: allocate correct amount of memory for regmap

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 663 bytes --]

On Sun, Feb 21, 2016 at 10:33:14PM -0800, Gregory Fong wrote:
> On Sun, Feb 21, 2016 at 6:16 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
> > We want the size of the struct, not of a pointer to it. To be future
> > proof, just dereference the pointer to get the desired type.
> 
> This looks like it fixes like a fairly serious issue: before this
> change, the driver may modify memory that wasn't allocated for this
> struct.  Shouldn't this also have Cc: stable?

Surely. I usually add the tag when committing, not when sending out.

> > Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> Acked-by: Gregory Fong <gregory.0xf0@gmail.com>

Thanks.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] i2c: brcmstb: allocate correct amount of memory for regmap

[Florian Fainelli]

Le 21/02/2016 06:16, Wolfram Sang a écrit :
> We want the size of the struct, not of a pointer to it. To be future
> proof, just dereference the pointer to get the desired type.
> 
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

Fixes: dd1aa2524bc5 ("i2c: brcmstb: Add Broadcom settop SoC i2c
controller driver")

Acked-by: Florian Fainelli <f.fainelli@gmail.com>

Thanks!
-- 
Florian

Re: [PATCH] i2c: brcmstb: allocate correct amount of memory for regmap

[Kamal Dasu]

> We want the size of the struct, not of a pointer to it. To be future proof,
> just dereference the pointer to get the desired type.

Thanks for catching and fixing this.

>
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

Reviewed-by: Kamal Dasu <kdasu.kdev@gmail.com>

Kamal

RE: [PATCH] i2c: brcmstb: allocate correct amount of memory for regmap

[Kamal Dasu]

> We want the size of the struct, not of a pointer to it. To be future 
> proof, just dereference the pointer to get the desired type.

Thanks for catching and fixing this.

>
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

Reviewed-by: Kamal Dasu <kdasu.kdev@gmail.com>

Kamal

Re: [PATCH] i2c: brcmstb: allocate correct amount of memory for regmap

[Kamal Dasu]

Wolfram,

I found a minor checkpatch issue with the change while applying the
patch to my local branch.

WARNING: line over 80 characters
#11: FILE: drivers/i2c/busses/i2c-brcmstb.c:589:
+       dev->bsc_regmap = devm_kzalloc(&pdev->dev,
sizeof(*dev->bsc_regmap), GFP_KERNEL);

Kamal

On Thu, Feb 25, 2016 at 2:32 PM, Kamal Dasu <kdasu.kdev@gmail.com> wrote:
>> We want the size of the struct, not of a pointer to it. To be future proof,
>> just dereference the pointer to get the desired type.
>
> Thanks for catching and fixing this.
>
>>
>> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
>
> Reviewed-by: Kamal Dasu <kdasu.kdev@gmail.com>
>
> Kamal

Re: [PATCH] i2c: brcmstb: allocate correct amount of memory for regmap

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 180 bytes --]

> WARNING: line over 80 characters

I am not too strict with this one. If one is just slightly over 80 chars
and then breaks the line, readability of the code usually gets worse.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] i2c: brcmstb: allocate correct amount of memory for regmap

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

On Sun, Feb 21, 2016 at 03:16:48PM +0100, Wolfram Sang wrote:
> We want the size of the struct, not of a pointer to it. To be future
> proof, just dereference the pointer to get the desired type.
> 
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

Applied to for-current with stable tag added, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]