linux-kernel - Re: [PATCH] tools/thermal: fix calloc argument ordering

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Mon, 18 Aug 2014 11:18:12 -0700
From:	Jacob Pan <jacob.jun.pan@...ux.intel.com>
To:	Arjun Sreedharan <arjun024@...il.com>
Cc:	rui.zhang@...el.com, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] tools/thermal: fix calloc argument ordering

On Mon, 18 Aug 2014 15:03:20 +0530
Arjun Sreedharan <arjun024@...il.com> wrote:

> @number first, @size second argument
> 
> Signed-off-by: Arjun Sreedharan <arjun024@...il.com>
> ---
Acked-by: Jacob Pan <jacob.jun.pan@...ux.intel.com>

Thanks for the fix.

>  tools/thermal/tmon/sysfs.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/thermal/tmon/sysfs.c b/tools/thermal/tmon/sysfs.c
> index dfe4548..1c12536 100644
> --- a/tools/thermal/tmon/sysfs.c
> +++ b/tools/thermal/tmon/sysfs.c
> @@ -446,7 +446,7 @@ int probe_thermal_sysfs(void)
>  		return -1;
>  	}
>  
> -	ptdata.tzi = calloc(sizeof(struct tz_info),
> ptdata.max_tz_instance+1);
> +	ptdata.tzi = calloc(ptdata.max_tz_instance+1, sizeof(struct
> tz_info)); if (!ptdata.tzi) {
>  		fprintf(stderr, "Err: allocate tz_info\n");
>  		return -1;
> @@ -454,8 +454,8 @@ int probe_thermal_sysfs(void)
>  
>  	/* we still show thermal zone information if there is no
> cdev */ if (ptdata.nr_cooling_dev) {
> -		ptdata.cdi = calloc(sizeof(struct cdev_info),
> -				ptdata.max_cdev_instance + 1);
> +		ptdata.cdi = calloc(ptdata.max_cdev_instance + 1,
> +				sizeof(struct cdev_info));
>  		if (!ptdata.cdi) {
>  			free(ptdata.tzi);
>  			fprintf(stderr, "Err: allocate cdev_info\n");

[Jacob Pan]
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/