Skip to contentSkip to conversation

s390: Fix prototype for execve

PATCH In review Jeff Mahoney 3 participants 3 messages Aug 24, 2010 – Aug 25, 2010 s390

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390: Fix prototype for execve

Commit d7627467b7a8dd6944885290a03a07ceb28c10eb constified the arguments to execve but missed the s390 prototype.

This patch fixes it up.

Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc David Howells <[email protected]>

---

 arch/s390/kernel/entry.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/kernel/entry.h +2 -2
@@ -42,8 +42,8 @@ long sys_clone(unsigned long newsp, unsi
 	       int __user *parent_tidptr, int __user *child_tidptr);
 long sys_vfork(void);
 void execve_tail(void);
-long sys_execve(const char __user *name, char __user * __user *argv,
-		char __user * __user *envp);
+long sys_execve(const char __user *name, const char __user *const __user *argv,
+		const char __user *const __user *envp);
 long sys_sigsuspend(int history0, int history1, old_sigset_t mask);
 long sys_sigaction(int sig, const struct old_sigaction __user *act,
 		   struct old_sigaction __user *oact);
Signature · 2 lines
Jeff Mahoney
SUSE Labs
#2 lore raw
In reply to Jeff Mahoney
Quoted 17 lines · Jeff Mahoney

Commit d7627467b7a8dd6944885290a03a07ceb28c10eb constified the arguments to execve but missed the s390 prototype.

This patch fixes it up.

Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc David Howells <[email protected]>

---

 arch/s390/kernel/entry.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/s390/kernel/entry.h long sys_clone(unsigned long newsp, unsi · line 49

Quoted 10 lines
arch/s390/kernel/entry.h +2 -2
@@ -42,8 +42,8 @@ long sys_clone(unsigned long newsp, unsi
 	       int __user *parent_tidptr, int __user *child_tidptr);
 long sys_vfork(void);
 void execve_tail(void);
-long sys_execve(const char __user *name, char __user * __user *argv,
-		char __user * __user *envp);
+long sys_execve(const char __user *name, const char __user *const __user *argv,
+		const char __user *const __user *envp);
 long sys_sigsuspend(int history0, int history1, old_sigset_t mask);
 long sys_sigaction(int sig, const struct old_sigaction __user *act,
 		   struct old_sigaction __user *oact);

A similar patch just got merged. Thanks!