Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39323
b: refs/heads/master
c: d875f9f
h: refs/heads/master
i:
  39321: dbcc4db
  39319: e933e53
v: v3
  • Loading branch information
Paolo 'Blaisorblade' Giarrusso authored and Linus Torvalds committed Oct 11, 2006
1 parent 3043eb7 commit 6345d2e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e27e80b3da7ad6b90185bd689879888907104a40
refs/heads/master: d875f9fd3f2369bf6f4d0e9989f00fe610eac470
6 changes: 3 additions & 3 deletions trunk/arch/um/kernel/tt/uaccess_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
* Licensed under the GPL
*/

#include <setjmp.h>
#include <string.h>
#include "user_util.h"
#include "uml_uaccess.h"
#include "task.h"
#include "kern_util.h"
#include "os.h"
#include "longjmp.h"

int __do_copy_from_user(void *to, const void *from, int n,
void **fault_addr, void **fault_catcher)
Expand Down Expand Up @@ -80,10 +80,10 @@ int __do_strnlen_user(const char *str, unsigned long n,
struct tt_regs save = TASK_REGS(get_current())->tt;
int ret;
unsigned long *faddrp = (unsigned long *)fault_addr;
sigjmp_buf jbuf;
jmp_buf jbuf;

*fault_catcher = &jbuf;
if(sigsetjmp(jbuf, 1) == 0)
if(UML_SETJMP(&jbuf) == 0)
ret = strlen(str) + 1;
else ret = *faddrp - (unsigned long) str;

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/um/os-Linux/tt.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include <errno.h>
#include <stdarg.h>
#include <stdlib.h>
#include <setjmp.h>
#include <sys/time.h>
#include <sys/ptrace.h>
#include <linux/ptrace.h>
Expand Down

0 comments on commit 6345d2e

Please sign in to comment.