[PATCH] iio:buffer: Wrong sized allocation of demux table elements.

[PATCH] iio:buffer: Wrong sized allocation of demux table elements.

[Jonathan Cameron]

The size of the allocation is currently set to the size of the pointer
rather than the structure we should actually be allocating.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Reported-by: kbuild@01.org
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/iio/industrialio-buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 84a952931f9f..ec82cb0bea38 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -951,7 +951,7 @@ static int iio_buffer_add_demux(struct iio_buffer *buffer,
 		(*p)->to + (*p)->length == out_loc) {
 		(*p)->length += length;
 	} else {
-		*p = kmalloc(sizeof(*p), GFP_KERNEL);
+		*p = kmalloc(sizeof(**p), GFP_KERNEL);
 		if (*p == NULL)
 			return -ENOMEM;
 		(*p)->from = in_loc;
-- 
2.0.3

Re: [PATCH] iio:buffer: Wrong sized allocation of demux table elements.

[Lars-Peter Clausen]

On 08/08/2014 10:43 AM, Jonathan Cameron wrote:
> The size of the allocation is currently set to the size of the pointer
> rather than the structure we should actually be allocating.
>
> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
> Reported-by: kbuild@01.org
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Cc: Lars-Peter Clausen <lars@metafoo.de>

Ok, that answers the earlier question.

Thanks.

Acked-by: Lars-Peter Clausen <lars@metafoo.de>

> ---
>   drivers/iio/industrialio-buffer.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
> index 84a952931f9f..ec82cb0bea38 100644
> --- a/drivers/iio/industrialio-buffer.c
> +++ b/drivers/iio/industrialio-buffer.c
> @@ -951,7 +951,7 @@ static int iio_buffer_add_demux(struct iio_buffer *buffer,
>   		(*p)->to + (*p)->length == out_loc) {
>   		(*p)->length += length;
>   	} else {
> -		*p = kmalloc(sizeof(*p), GFP_KERNEL);
> +		*p = kmalloc(sizeof(**p), GFP_KERNEL);
>   		if (*p == NULL)
>   			return -ENOMEM;
>   		(*p)->from = in_loc;
>

Re: [PATCH] iio:buffer: Wrong sized allocation of demux table elements.

[Jonathan Cameron]

On 08/08/14 09:51, Lars-Peter Clausen wrote:
> On 08/08/2014 10:43 AM, Jonathan Cameron wrote:
>> The size of the allocation is currently set to the size of the pointer
>> rather than the structure we should actually be allocating.
>>
>> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
>> Reported-by: kbuild@01.org
>> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
>> Cc: Lars-Peter Clausen <lars@metafoo.de>
>
> Ok, that answers the earlier question.
>
> Thanks.
>
> Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Applied to the togreg branch of iio.git and pushed out as testing...

Thanks,
>
>> ---
>>   drivers/iio/industrialio-buffer.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
>> index 84a952931f9f..ec82cb0bea38 100644
>> --- a/drivers/iio/industrialio-buffer.c
>> +++ b/drivers/iio/industrialio-buffer.c
>> @@ -951,7 +951,7 @@ static int iio_buffer_add_demux(struct iio_buffer *buffer,
>>           (*p)->to + (*p)->length == out_loc) {
>>           (*p)->length += length;
>>       } else {
>> -        *p = kmalloc(sizeof(*p), GFP_KERNEL);
>> +        *p = kmalloc(sizeof(**p), GFP_KERNEL);
>>           if (*p == NULL)
>>               return -ENOMEM;
>>           (*p)->from = in_loc;
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html