Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] ALSA: convert kcalloc to kzalloc

Browse source 
This patch introduces a memory-leak tracking version of kzalloc for ALSA.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Jaroslav Kysela <perex@suse.cz>
Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Pekka Enberg 2005-09-06 15:18:36 -07:00 committed by Linus Torvalds
parent e915fc497a
commit 8db08ea7e6
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sound/core.h
View file

@ -291,12 +291,14 @@ void snd_memory_done(void);
int snd_memory_info_init(void); int snd_memory_info_init(void);
int snd_memory_info_done(void); int snd_memory_info_done(void);
void *snd_hidden_kmalloc(size_t size, unsigned int __nocast flags); void *snd_hidden_kmalloc(size_t size, unsigned int __nocast flags);
void *snd_hidden_kzalloc(size_t size, unsigned int __nocast flags);
void *snd_hidden_kcalloc(size_t n, size_t size, unsigned int __nocast flags); void *snd_hidden_kcalloc(size_t n, size_t size, unsigned int __nocast flags);
void snd_hidden_kfree(const void *obj); void snd_hidden_kfree(const void *obj);
void *snd_hidden_vmalloc(unsigned long size); void *snd_hidden_vmalloc(unsigned long size);
void snd_hidden_vfree(void *obj); void snd_hidden_vfree(void *obj);
char *snd_hidden_kstrdup(const char *s, unsigned int __nocast flags); char *snd_hidden_kstrdup(const char *s, unsigned int __nocast flags);
#define kmalloc(size, flags) snd_hidden_kmalloc(size, flags) #define kmalloc(size, flags) snd_hidden_kmalloc(size, flags)
#define kzalloc(size, flags) snd_hidden_kzalloc(size, flags)
#define kcalloc(n, size, flags) snd_hidden_kcalloc(n, size, flags) #define kcalloc(n, size, flags) snd_hidden_kcalloc(n, size, flags)
#define kfree(obj) snd_hidden_kfree(obj) #define kfree(obj) snd_hidden_kfree(obj)
#define vmalloc(size) snd_hidden_vmalloc(size) #define vmalloc(size) snd_hidden_vmalloc(size)

14
sound/core/memory.c
View file

@ -116,15 +116,21 @@ void *snd_hidden_kmalloc(size_t size, unsigned int __nocast flags)
return _snd_kmalloc(size, flags); return _snd_kmalloc(size, flags);
} }
void *snd_hidden_kzalloc(size_t size, unsigned int __nocast flags)
{
void *ret = _snd_kmalloc(size, flags);
if (ret)
memset(ret, 0, size);
return ret;
}
EXPORT_SYMBOL(snd_hidden_kzalloc);
void *snd_hidden_kcalloc(size_t n, size_t size, unsigned int __nocast flags) void *snd_hidden_kcalloc(size_t n, size_t size, unsigned int __nocast flags)
{ {
void *ret = NULL; void *ret = NULL;
if (n != 0 && size > INT_MAX / n) if (n != 0 && size > INT_MAX / n)
return ret; return ret;
ret = _snd_kmalloc(n * size, flags); return snd_hidden_kzalloc(n * size, flags);
if (ret)
memset(ret, 0, n * size);
return ret;
} }
void snd_hidden_kfree(const void *obj) void snd_hidden_kfree(const void *obj)

2
sound/pci/ali5451/ali5451.c
View file

@ -2249,7 +2249,7 @@ static int __devinit snd_ali_create(snd_card_t * card,
return -ENXIO; return -ENXIO;
} }
if ((codec = kcalloc(1, sizeof(*codec), GFP_KERNEL)) == NULL) { if ((codec = kzalloc(sizeof(*codec), GFP_KERNEL)) == NULL) {
pci_disable_device(pci); pci_disable_device(pci);
return -ENOMEM; return -ENOMEM;
} }