[PATCH] 2.6.6 memory allocation checks in cs46xx_dsp_proc_register_scb

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH] 2.6.6 memory allocation checks in cs46xx_dsp_proc_register_scb_desc()
@ 2004-06-06 16:06 Yury Umanets
  2004-06-06 17:20 ` Randy.Dunlap
  0 siblings, 1 reply; 4+ messages in thread
From: Yury Umanets @ 2004-06-06 16:06 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-kernel

Adds memory allocation checks in cs46xx_dsp_proc_register_scb_desc()

 ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c |    3 +++
 1 files changed, 3 insertions(+)

diff -rupN ./linux-2.6.6/sound/pci/cs46xx/dsp_spos_scb_lib.c
./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c
--- ./linux-2.6.6/sound/pci/cs46xx/dsp_spos_scb_lib.c	Mon May 10
05:33:20 2004
+++ ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c	Wed Jun 
2 14:57:41 2004
@@ -246,6 +246,9 @@ void cs46xx_dsp_proc_register_scb_desc (
 		if ((entry = snd_info_create_card_entry(ins->snd_card, scb->scb_name,
 							ins->proc_dsp_dir)) != NULL) {
 			scb_info = kmalloc(sizeof(proc_scb_info_t), GFP_KERNEL);
+			if (!scb_info)
+				return;
+                                
 			scb_info->chip = chip;
 			scb_info->scb_desc = scb;
       



-- 
umka


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] 2.6.6 memory allocation checks in cs46xx_dsp_proc_register_scb_desc()
  2004-06-06 16:06 [PATCH] 2.6.6 memory allocation checks in cs46xx_dsp_proc_register_scb_desc() Yury Umanets
@ 2004-06-06 17:20 ` Randy.Dunlap
  2004-06-06 17:40   ` Yury Umanets
  0 siblings, 1 reply; 4+ messages in thread
From: Randy.Dunlap @ 2004-06-06 17:20 UTC (permalink / raw)
  To: Yury Umanets; +Cc: akpm, linux-kernel

On Sun, 06 Jun 2004 19:06:42 +0300 Yury Umanets wrote:

| Adds memory allocation checks in cs46xx_dsp_proc_register_scb_desc()
| 
|  ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c |    3 +++
|  1 files changed, 3 insertions(+)
| 
| diff -rupN ./linux-2.6.6/sound/pci/cs46xx/dsp_spos_scb_lib.c
| ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c
| --- ./linux-2.6.6/sound/pci/cs46xx/dsp_spos_scb_lib.c	Mon May 10
| 05:33:20 2004
| +++ ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c	Wed Jun 
| 2 14:57:41 2004
| @@ -246,6 +246,9 @@ void cs46xx_dsp_proc_register_scb_desc (
|  		if ((entry = snd_info_create_card_entry(ins->snd_card, scb->scb_name,
|  							ins->proc_dsp_dir)) != NULL) {
|  			scb_info = kmalloc(sizeof(proc_scb_info_t), GFP_KERNEL);
| +			if (!scb_info)
| +				return;
| +                                
|  			scb_info->chip = chip;
|  			scb_info->scb_desc = scb;
|        

This seems to be missing some other cleanup on the failure path,
like it does below in the same function:

				snd_info_free_entry(entry);

--
~Randy

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] 2.6.6 memory allocation checks in cs46xx_dsp_proc_register_scb_desc()
  2004-06-06 17:20 ` Randy.Dunlap
@ 2004-06-06 17:40   ` Yury Umanets
  2004-06-06 17:54     ` Yury Umanets
  0 siblings, 1 reply; 4+ messages in thread
From: Yury Umanets @ 2004-06-06 17:40 UTC (permalink / raw)
  To: Randy.Dunlap; +Cc: akpm, linux-kernel

On Sun, 2004-06-06 at 20:20, Randy.Dunlap wrote:
> On Sun, 06 Jun 2004 19:06:42 +0300 Yury Umanets wrote:
> 
> | Adds memory allocation checks in cs46xx_dsp_proc_register_scb_desc()
> | 
> |  ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c |    3 +++
> |  1 files changed, 3 insertions(+)
> | 
> | diff -rupN ./linux-2.6.6/sound/pci/cs46xx/dsp_spos_scb_lib.c
> | ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c
> | --- ./linux-2.6.6/sound/pci/cs46xx/dsp_spos_scb_lib.c	Mon May 10
> | 05:33:20 2004
> | +++ ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c	Wed Jun 
> | 2 14:57:41 2004
> | @@ -246,6 +246,9 @@ void cs46xx_dsp_proc_register_scb_desc (
> |  		if ((entry = snd_info_create_card_entry(ins->snd_card, scb->scb_name,
> |  							ins->proc_dsp_dir)) != NULL) {
> |  			scb_info = kmalloc(sizeof(proc_scb_info_t), GFP_KERNEL);
> | +			if (!scb_info)
> | +				return;
> | +                                
> |  			scb_info->chip = chip;
> |  			scb_info->scb_desc = scb;
> |        
> 
> This seems to be missing some other cleanup on the failure path,
> like it does below in the same function:
> 
> 				snd_info_free_entry(entry);
oops, you're right. Thanks Randy. Will fix that.

> 
> --
> ~Randy
> -
> 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/
-- 
umka


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] 2.6.6 memory allocation checks in cs46xx_dsp_proc_register_scb_desc()
  2004-06-06 17:40   ` Yury Umanets
@ 2004-06-06 17:54     ` Yury Umanets
  0 siblings, 0 replies; 4+ messages in thread
From: Yury Umanets @ 2004-06-06 17:54 UTC (permalink / raw)
  To: Randy.Dunlap; +Cc: akpm, linux-kernel

On Sun, 2004-06-06 at 20:40, Yury Umanets wrote:
> On Sun, 2004-06-06 at 20:20, Randy.Dunlap wrote:
> > On Sun, 06 Jun 2004 19:06:42 +0300 Yury Umanets wrote:
> > 
> > | Adds memory allocation checks in cs46xx_dsp_proc_register_scb_desc()
> > | 
> > |  ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c |    3 +++
> > |  1 files changed, 3 insertions(+)
> > | 
> > | diff -rupN ./linux-2.6.6/sound/pci/cs46xx/dsp_spos_scb_lib.c
> > | ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c
> > | --- ./linux-2.6.6/sound/pci/cs46xx/dsp_spos_scb_lib.c	Mon May 10
> > | 05:33:20 2004
> > | +++ ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c	Wed Jun 
> > | 2 14:57:41 2004
> > | @@ -246,6 +246,9 @@ void cs46xx_dsp_proc_register_scb_desc (
> > |  		if ((entry = snd_info_create_card_entry(ins->snd_card, scb->scb_name,
> > |  							ins->proc_dsp_dir)) != NULL) {
> > |  			scb_info = kmalloc(sizeof(proc_scb_info_t), GFP_KERNEL);
> > | +			if (!scb_info)
> > | +				return;
> > | +                                
> > |  			scb_info->chip = chip;
> > |  			scb_info->scb_desc = scb;
> > |        
> > 
> > This seems to be missing some other cleanup on the failure path,
> > like it does below in the same function:
> > 
> > 				snd_info_free_entry(entry);
> oops, you're right. Thanks Randy. Will fix that.
> 

Corrected version is bellow.

 ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c |    8
+++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

Signed-off-by: Yury Umanets <torque@ukrpost.net>

diff -rupN ./linux-2.6.6/sound/pci/cs46xx/dsp_spos_scb_lib.c
./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c
--- ./linux-2.6.6/sound/pci/cs46xx/dsp_spos_scb_lib.c	Mon May 10
05:33:20 2004
+++ ./linux-2.6.6-modified/sound/pci/cs46xx/dsp_spos_scb_lib.c	Sun Jun 
6 20:43:39 2004
@@ -246,6 +246,12 @@ void cs46xx_dsp_proc_register_scb_desc (
 		if ((entry = snd_info_create_card_entry(ins->snd_card, scb->scb_name,
 							ins->proc_dsp_dir)) != NULL) {
 			scb_info = kmalloc(sizeof(proc_scb_info_t), GFP_KERNEL);
+			if (!scb_info) {
+				snd_info_free_entry(entry);
+				entry = NULL;
+				goto out;
+			}
+                                
 			scb_info->chip = chip;
 			scb_info->scb_desc = scb;
       
@@ -262,7 +268,7 @@ void cs46xx_dsp_proc_register_scb_desc (
 				entry = NULL;
 			}
 		}
-
+out:
 		scb->proc_info = entry;
 	}
 }
 


-- 
umka


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2004-06-06 17:54 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-06-06 16:06 [PATCH] 2.6.6 memory allocation checks in cs46xx_dsp_proc_register_scb_desc() Yury Umanets
2004-06-06 17:20 ` Randy.Dunlap
2004-06-06 17:40   ` Yury Umanets
2004-06-06 17:54     ` Yury Umanets

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox