2008-08-05 20:16:48

by Jeff Dike

Subject: [PATCH 5/14] missed kmalloc() in pcap_user.c

>From 296cd66f7f6e130fe08e6880ecb13c3fc615a8db

From: Al Viro <[email protected]>

Signed-off-by: Al Viro <[email protected]>
Acked-by: Jeff Dike <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
---
arch/um/drivers/pcap_user.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c
index e980935..5f90358 100644
--- a/arch/um/drivers/pcap_user.c
+++ b/arch/um/drivers/pcap_user.c
@@ -50,7 +50,7 @@ static int pcap_open(void *data)
return -EIO;
}

- pri->compiled = kmalloc(sizeof(struct bpf_program),
+ pri->compiled = uml_kmalloc(sizeof(struct bpf_program),
UM_GFP_KERNEL);
if (pri->compiled == NULL) {
printk(UM_KERN_ERR "pcap_open : kmalloc failed\n");
--
1.5.5.1

2008-08-16 22:39:12

by Greg KH

Subject: patch uml-missed-kmalloc-in-pcap_user.c.patch added to 2.6.25-stable tree

This is a note to let you know that we have just queued up the patch titled

Subject: uml: missed kmalloc() in pcap_user.c

to the 2.6.25-stable tree. Its filename is

uml-missed-kmalloc-in-pcap_user.c.patch

A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary


>From [email protected] Tue Aug 5 13:14:38 2008
From: Al Viro <[email protected]>
Date: Tue, 5 Aug 2008 16:14:05 -0400
Subject: uml: missed kmalloc() in pcap_user.c
To: [email protected]
Cc: LKML <[email protected]>, uml-devel <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline

From: Al Viro <[email protected]>

commit 296cd66f7f6e130fe08e6880ecb13c3fc615a8db upstream

Signed-off-by: Al Viro <[email protected]>
Acked-by: Jeff Dike <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
arch/um/drivers/pcap_user.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/um/drivers/pcap_user.c
+++ b/arch/um/drivers/pcap_user.c
@@ -50,7 +50,7 @@ static int pcap_open(void *data)
return -EIO;
}

- pri->compiled = kmalloc(sizeof(struct bpf_program),
+ pri->compiled = uml_kmalloc(sizeof(struct bpf_program),
UM_GFP_KERNEL);
if (pri->compiled == NULL) {
printk(UM_KERN_ERR "pcap_open : kmalloc failed\n");


Patches currently in stable-queue which might be from [email protected] are

queue-2.6.25/uml-missed-kmalloc-in-pcap_user.c.patch
queue-2.6.25/uml-missing-export-of-csum_partial-on-uml-amd64.patch