[PATCH] Fixes for Incorrect kmalloc() Sizes

[PATCH] Fixes for Incorrect kmalloc() Sizes

[david chan]

Hi,

These two patches fix silly kmalloc errors that allocate too little space.


Thank you,
David Chan


---snip---
--- drivers/sound/emu10k1/midi.c.orig	Fri Feb  9 11:30:23 2001
+++ drivers/sound/emu10k1/midi.c	Tue May  8 19:43:43 2001
@@ -56,7 +56,7 @@
 {
 	struct midi_hdr *midihdr;

-	if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr
*), GFP_KERNEL)) == NULL) {
+	if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct
midi_hdr), GFP_KERNEL)) == NULL) {
 		ERROR();
 		return -EINVAL;
 	}
@@ -328,7 +328,7 @@
 	if (!access_ok(VERIFY_READ, buffer, count))
 		return -EFAULT;

-	if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr
*), GFP_KERNEL)) == NULL)
+	if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct
midi_hdr), GFP_KERNEL)) == NULL)
 		return -EINVAL;

 	midihdr->bufferlength = count;
---snip---

---snip---
--- drivers/telephony/ixj.c.orig	Tue May  8 20:00:07 2001
+++ drivers/telephony/ixj.c	Tue May  8 20:00:25 2001
@@ -4475,7 +4475,7 @@
 {
 	IXJ_FILTER_CADENCE *lcp;

-	lcp = kmalloc(sizeof(IXJ_CADENCE), GFP_KERNEL);
+	lcp = kmalloc(sizeof(IXJ_FILTER_CADENCE), GFP_KERNEL);
 	if (lcp == NULL)
 		return -ENOMEM;
 	if (copy_from_user(lcp, (char *) cp, sizeof(IXJ_FILTER_CADENCE)))
---snip---

Re: [PATCH] Fixes for Incorrect kmalloc() Sizes

[David]

The kernel ixj.c and associated files are severely out of date and cause 
hard machine hangs when used (kernel 2.4.n).  I suggest that the files 
in the telephony directory be brought up to date with the current CVS 
code.  At least the CVS code only causes an OOPS and doesn't kill the 
whole machine.

David

david chan wrote:

>Hi,
>
>These two patches fix silly kmalloc errors that allocate too little space.
>
>
>Thank you,
>David Chan
>
>
>---snip---
>--- drivers/sound/emu10k1/midi.c.orig	Fri Feb  9 11:30:23 2001
>+++ drivers/sound/emu10k1/midi.c	Tue May  8 19:43:43 2001
>@@ -56,7 +56,7 @@
> {
> 	struct midi_hdr *midihdr;
>
>-	if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr
>*), GFP_KERNEL)) == NULL) {
>+	if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct
>midi_hdr), GFP_KERNEL)) == NULL) {
> 		ERROR();
> 		return -EINVAL;
> 	}
>@@ -328,7 +328,7 @@
> 	if (!access_ok(VERIFY_READ, buffer, count))
> 		return -EFAULT;
>
>-	if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr
>*), GFP_KERNEL)) == NULL)
>+	if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct
>midi_hdr), GFP_KERNEL)) == NULL)
> 		return -EINVAL;
>
> 	midihdr->bufferlength = count;
>---snip---
>
>---snip---
>--- drivers/telephony/ixj.c.orig	Tue May  8 20:00:07 2001
>+++ drivers/telephony/ixj.c	Tue May  8 20:00:25 2001
>@@ -4475,7 +4475,7 @@
> {
> 	IXJ_FILTER_CADENCE *lcp;
>
>-	lcp = kmalloc(sizeof(IXJ_CADENCE), GFP_KERNEL);
>+	lcp = kmalloc(sizeof(IXJ_FILTER_CADENCE), GFP_KERNEL);
> 	if (lcp == NULL)
> 		return -ENOMEM;
> 	if (copy_from_user(lcp, (char *) cp, sizeof(IXJ_FILTER_CADENCE)))
>---snip---
>
>
>
>
>-
>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/
>

Re: [PATCH] Fixes for Incorrect kmalloc() Sizes

[Alan Cox]

> The kernel ixj.c and associated files are severely out of date and cause 
> hard machine hangs when used (kernel 2.4.n).  I suggest that the files 
> in the telephony directory be brought up to date with the current CVS 
> code.  At least the CVS code only causes an OOPS and doesn't kill the 
> whole machine.

This is a discussion we had a while back with the ixj maintainers. The 
outcome is that yes I agree, no I've not had patches since a discussion a while
back about dynamic allocation