X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=security%2Fcommoncap.c;h=aa97704564d4a39521825f79897899f7815816a1;hb=9e48858f7d36a6a3849f1d1b40c3bf5624b4ee7c;hp=97ac1f16771761c9889ab8ec24d85b2b2e427341;hpb=b5f22a59c0356655a501190959db9f7f5dd07e3f;p=safe%2Fjmp%2Flinux-2.6

diff --git a/security/commoncap.c b/security/commoncap.c
index 97ac1f1..aa97704 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -101,7 +101,7 @@ int cap_settime(struct timespec *ts, struct timezone *tz)
 }
 
 /**
- * cap_ptrace_may_access - Determine whether the current process may access
+ * cap_ptrace_access_check - Determine whether the current process may access
  *			   another
  * @child: The process to be accessed
  * @mode: The mode of attachment.
@@ -109,7 +109,7 @@ int cap_settime(struct timespec *ts, struct timezone *tz)
  * Determine whether a process may access another, returning 0 if permission
  * granted, -ve if denied.
  */
-int cap_ptrace_may_access(struct task_struct *child, unsigned int mode)
+int cap_ptrace_access_check(struct task_struct *child, unsigned int mode)
 {
 	int ret = 0;
 
@@ -948,7 +948,6 @@ changed:
 	return commit_creds(new);
 
 no_change:
-	error = 0;
 error:
 	abort_creds(new);
 	return error;