Skip to content

Commit

Permalink
[PATCH] uml: stack consumption reduction
Browse files Browse the repository at this point in the history
Fix some stack abuse in the sysrq t path.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Sep 29, 2006
1 parent 80c1374 commit f92afe5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
15 changes: 10 additions & 5 deletions arch/um/drivers/mconsole_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,11 @@ void mconsole_remove(struct mc_request *req)
mconsole_reply(req, err_msg, err, 0);
}

struct mconsole_output {
struct list_head list;
struct mc_request *req;
};

static DEFINE_SPINLOCK(console_lock);
static LIST_HEAD(clients);
static char console_buf[MCONSOLE_MAX_DATA];
Expand All @@ -622,10 +627,10 @@ static void console_write(struct console *console, const char *string,
return;

list_for_each(ele, &clients){
struct mconsole_entry *entry;
struct mconsole_output *entry;

entry = list_entry(ele, struct mconsole_entry, list);
mconsole_reply_len(&entry->request, console_buf,
entry = list_entry(ele, struct mconsole_output, list);
mconsole_reply_len(entry->req, console_buf,
console_index, 0, 1);
}

Expand All @@ -649,10 +654,10 @@ late_initcall(mc_add_console);
static void with_console(struct mc_request *req, void (*proc)(void *),
void *arg)
{
struct mconsole_entry entry;
struct mconsole_output entry;
unsigned long flags;

entry.request = *req;
entry.req = req;
list_add(&entry.list, &clients);
spin_lock_irqsave(&console_lock, flags);

Expand Down
4 changes: 4 additions & 0 deletions arch/um/drivers/mconsole_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ int mconsole_get_request(int fd, struct mc_request *req)
int mconsole_reply_len(struct mc_request *req, const char *str, int total,
int err, int more)
{
/* XXX This is a stack consumption problem. It'd be nice to
* make it global and serialize access to it, but there are a
* ton of callers to this function.
*/
struct mconsole_reply reply;
int len, n;

Expand Down

0 comments on commit f92afe5

Please sign in to comment.