Re: [PATCH] LSM changes for 2.5.43

From: Greg KH (gregat_private)
Date: Thu Oct 17 2002 - 14:29:24 PDT

  • Next message: Greg KH: "Re: [PATCH] LSM changes for 2.5.43"

    ChangeSet 1.800, 2002/10/17 14:04:04-07:00, gregat_private
    
    LSM: change all usages of security_ops->ptrace() to security_ptrace()
    
    
    diff -Nru a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
    --- a/arch/arm/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/arm/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -719,8 +719,7 @@
     		/* are we already being traced? */
     		if (current->ptrace & PT_PTRACED)
     			goto out;
    -		ret = security_ops->ptrace(current->parent, current);
    -		if (ret)
    +		if ((ret = security_ptrace(current->parent, current)))
     			goto out;
     		/* set the ptrace bit in the process flags. */
     		current->ptrace |= PT_PTRACED;
    diff -Nru a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
    --- a/arch/i386/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/i386/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -160,8 +160,7 @@
     		/* are we already being traced? */
     		if (current->ptrace & PT_PTRACED)
     			goto out;
    -		ret = security_ops->ptrace(current->parent, current);
    -		if (ret)
    +		if ((ret = security_ptrace(current->parent, current)))
     			goto out;
     		/* set the ptrace bit in the process flags. */
     		current->ptrace |= PT_PTRACED;
    diff -Nru a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
    --- a/arch/ia64/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/ia64/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -1101,8 +1101,7 @@
     		/* are we already being traced? */
     		if (current->ptrace & PT_PTRACED)
     			goto out;
    -		ret = security_ops->ptrace(current->parent, current);
    -		if (ret)
    +		if ((ret = security_ptrace(current->parent, current)))
     			goto out;
     		current->ptrace |= PT_PTRACED;
     		ret = 0;
    diff -Nru a/arch/ppc/kernel/ptrace.c b/arch/ppc/kernel/ptrace.c
    --- a/arch/ppc/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/ppc/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -166,8 +166,7 @@
     		/* are we already being traced? */
     		if (current->ptrace & PT_PTRACED)
     			goto out;
    -		ret = security_ops->ptrace(current->parent, current);
    -		if (ret)
    +		if ((ret = security_ptrace(current->parent, current)))
     			goto out;
     		/* set the ptrace bit in the process flags. */
     		current->ptrace |= PT_PTRACED;
    diff -Nru a/arch/ppc64/kernel/ptrace.c b/arch/ppc64/kernel/ptrace.c
    --- a/arch/ppc64/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/ppc64/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -59,8 +59,7 @@
     		/* are we already being traced? */
     		if (current->ptrace & PT_PTRACED)
     			goto out;
    -		ret = security_ops->ptrace(current->parent, current);
    -		if (ret)
    +		if ((ret = security_ptrace(current->parent, current)))
     			goto out;
     		/* set the ptrace bit in the process flags. */
     		current->ptrace |= PT_PTRACED;
    diff -Nru a/arch/ppc64/kernel/ptrace32.c b/arch/ppc64/kernel/ptrace32.c
    --- a/arch/ppc64/kernel/ptrace32.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/ppc64/kernel/ptrace32.c	Thu Oct 17 14:19:12 2002
    @@ -48,8 +48,7 @@
     		/* are we already being traced? */
     		if (current->ptrace & PT_PTRACED)
     			goto out;
    -		ret = security_ops->ptrace(current->parent, current);
    -		if (ret)
    +		if ((ret = security_ptrace(current->parent, current)))
     			goto out;
     		/* set the ptrace bit in the process flags. */
     		current->ptrace |= PT_PTRACED;
    diff -Nru a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
    --- a/arch/s390/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/s390/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -330,8 +330,7 @@
     		ret = -EPERM;
     		if (current->ptrace & PT_PTRACED)
     			goto out;
    -		ret = security_ops->ptrace(current->parent, current);
    -		if (ret)
    +		if ((ret = security_ptrace(current->parent, current)))
     			goto out;
     		/* set the ptrace bit in the process flags. */
     		current->ptrace |= PT_PTRACED;
    diff -Nru a/arch/s390x/kernel/ptrace.c b/arch/s390x/kernel/ptrace.c
    --- a/arch/s390x/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/s390x/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -569,8 +569,7 @@
     		ret = -EPERM;
     		if (current->ptrace & PT_PTRACED)
     			goto out;
    -		ret = security_ops->ptrace(current->parent, current);
    -		if (ret)
    +		if ((ret = security_ptrace(current->parent, current)))
     			goto out;
     		/* set the ptrace bit in the process flags. */
     		current->ptrace |= PT_PTRACED;
    diff -Nru a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
    --- a/arch/sparc/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/sparc/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -291,8 +291,7 @@
     			pt_error_return(regs, EPERM);
     			goto out;
     		}
    -		ret = security_ops->ptrace(current->parent, current);
    -		if (ret) {
    +		if ((ret = security_ptrace(current->parent, current))) {
     			pt_error_return(regs, -ret);
     			goto out;
     		}
    diff -Nru a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
    --- a/arch/sparc64/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/sparc64/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -140,8 +140,7 @@
     			pt_error_return(regs, EPERM);
     			goto out;
     		}
    -		ret = security_ops->ptrace(current->parent, current);
    -		if (ret) {
    +		if ((ret = security_ptrace(current->parent, current))) {
     			pt_error_return(regs, -ret);
     			goto out;
     		}
    diff -Nru a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
    --- a/arch/um/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/um/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -33,8 +33,7 @@
     		if (current->ptrace & PT_PTRACED)
     			goto out;
     
    -		ret = security_ops->ptrace(current->parent, current);
    -		if(ret)
    +		if ((ret = security_ptrace(current->parent, current)))
      			goto out;
     
     		/* set the ptrace bit in the process flags. */
    diff -Nru a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
    --- a/arch/x86_64/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/arch/x86_64/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -178,8 +178,7 @@
     		/* are we already being traced? */
     		if (current->ptrace & PT_PTRACED)
     			goto out;
    -		ret = security_ops->ptrace(current->parent, current);
    -		if (ret)
    +		if ((ret = security_ptrace(current->parent, current)))
     			goto out;
     		/* set the ptrace bit in the process flags. */
     		current->ptrace |= PT_PTRACED;
    diff -Nru a/kernel/ptrace.c b/kernel/ptrace.c
    --- a/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    +++ b/kernel/ptrace.c	Thu Oct 17 14:19:12 2002
    @@ -101,8 +101,7 @@
     	/* the same process cannot be attached many times */
     	if (task->ptrace & PT_PTRACED)
     		goto bad;
    -	retval = security_ops->ptrace(current, task);
    -	if (retval)
    +	if ((retval = security_ptrace(current, task)))
     		goto bad;
     
     	/* Go */
    _______________________________________________
    linux-security-module mailing list
    linux-security-moduleat_private
    http://mail.wirex.com/mailman/listinfo/linux-security-module
    



    This archive was generated by hypermail 2b30 : Thu Oct 17 2002 - 14:35:59 PDT