diff options
| author | Josh Stone <jistone@redhat.com> | 2010-02-04 17:44:59 -0800 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2010-02-04 17:44:59 -0800 |
| commit | 463d666cc53a2f9d2df0f68310d6575ccae42bfe (patch) | |
| tree | e23c567c3b94aafd3eadeac8bbc8d43d309ba236 /tapset | |
| parent | 6462165c7a381c3eac8b097647122905f561e5a5 (diff) | |
| download | systemtap-steved-463d666cc53a2f9d2df0f68310d6575ccae42bfe.tar.gz systemtap-steved-463d666cc53a2f9d2df0f68310d6575ccae42bfe.tar.xz systemtap-steved-463d666cc53a2f9d2df0f68310d6575ccae42bfe.zip | |
Revert "PR11234: Ensure __get_argv doesn't overflow"
This reverts commit f75409719f120a3dbee66d761cf23a64092d1414.
Diffstat (limited to 'tapset')
| -rw-r--r-- | tapset/aux_syscalls.stp | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp index 2d0ba210..bab0f640 100644 --- a/tapset/aux_syscalls.stp +++ b/tapset/aux_syscalls.stp @@ -401,20 +401,20 @@ function __sem_flags:string(semflg:long) /* This function copies an argv from userspace. */ function __get_argv:string(a:long, first:long) %{ /* pure */ - char __user *__user *argv = (char __user *__user *)(long)THIS->a; + char __user *__user *argv = (char __user *__user *)(long)THIS->a; char __user *vstr; int space, rc, len = MAXSTRINGLEN; char *str = THIS->__retvalue; char buf[80]; char *ptr = buf; - + if (THIS->first && argv) argv++; - while (argv != NULL && len) { + while (argv != NULL) { if (__stp_get_user (vstr, argv)) - break; + break; if (vstr == NULL) break; @@ -443,8 +443,8 @@ function __get_argv:string(a:long, first:long) *str++='\"'; len--; } - - rc = min(len, (int) strlcpy (str, buf, len)); + + rc = strlcpy (str, buf, len); str += rc; len -= rc; @@ -455,15 +455,13 @@ function __get_argv:string(a:long, first:long) argv++; } - if (!len) - --str; *str = 0; %} /* This function copies an argv from userspace. */ function __get_compat_argv:string(a:long, first:long) %{ /* pure */ #ifdef CONFIG_COMPAT - compat_uptr_t __user *__user *argv = (compat_uptr_t __user *__user *)(long)THIS->a; + compat_uptr_t __user *__user *argv = (compat_uptr_t __user *__user *)(long)THIS->a; compat_uptr_t __user *vstr; int space, rc, len = MAXSTRINGLEN; char *str = THIS->__retvalue; @@ -473,9 +471,9 @@ function __get_compat_argv:string(a:long, first:long) if (THIS->first && argv) argv++; - while (argv != NULL && len) { + while (argv != NULL) { if (__stp_get_user (vstr, argv)) - break; + break; if (vstr == NULL) break; @@ -504,8 +502,8 @@ function __get_compat_argv:string(a:long, first:long) *str++='\"'; len--; } - - rc = min(len, (int) strlcpy (str, buf, len)); + + rc = strlcpy (str, buf, len); str += rc; len -= rc; @@ -516,8 +514,6 @@ function __get_compat_argv:string(a:long, first:long) argv++; } - if (!len) - --str; *str = 0; #endif %} |