lguest fixes
Subsystems (2)
The following changes since commit 18e352e4a73465349711a9324767e1b2453383e2:
Linus Torvalds (1):
Linux 2.6.29-rc3
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus.git master
Atsushi SAKAI (1):
lguest: typos fix
Mark Wallis (1):
lguest: Fix a memory leak with the lg object during launcher close
Tim 'mithro' Ansell (1):
lguest: disable the FORTIFY for lguest.
Documentation/lguest/Makefile | 2 +- arch/x86/lguest/boot.c | 4 ++-- drivers/lguest/core.c | 2 +- drivers/lguest/lguest_user.c | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-)
Documentation/lguest/Makefile +1 -1
@@ -1,5 +1,5 @@ # This creates the demonstration utility "lguest" which runs a Linux guest. -CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include +CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE LDLIBS:=-lz all: lguest
arch/x86/lguest/boot.c +2 -2
@@ -931,7 +931,7 @@ static void lguest_restart(char *reason)* that we can fit comfortably. * * First we need assembly templates of each of the patchable Guest operations, -* and these are in lguest_asm.S. */ +* and these are in i386_head.S. */ /*G:060 We construct a table from the assembler templates: */ static const struct lguest_insns
@@ -1093,7 +1093,7 @@ __init void lguest_init(void) acpi_ht =0 ;#endif -/* We set the perferred console to "hvc". This is the "hypervisor +/* We set the preferred console to "hvc". This is the "hypervisor * virtual console" driver written by the PowerPC people, which we also * adapted for lguest's use. */ add_preferred_console ("hvc" ,0 ,NULL );
drivers/lguest/core.c +1 -1
@@ -224,7 +224,7 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user)break ;/* If the Guest asked to be stopped, we sleep. The Guest's -* clock timer or LHCALL_BREAK from the Waker will wake us. */ +* clock timer or LHREQ_BREAK from the Waker will wake us. */ if (cpu->halted) {set_current_state (TASK_INTERRUPTIBLE );schedule ();
drivers/lguest/lguest_user.c +2 -3
@@ -307,9 +307,8 @@ static int close(struct inode *inode, struct file *file)* kmalloc()ed string, either of which is ok to hand to kfree(). */ if (!IS_ERR (lg->dead))kfree (lg->dead); -/* We clear the entire structure, which also marks it as free for the -* next user. */ -memset (lg,0 ,sizeof (*lg)); +/* Free the memory allocated to the lguest_struct */ +kfree (lg);/* Release lock and exit. */ mutex_unlock (&lguest_lock);