lkml.org 
[lkml]   [2002]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] LSM changes for 2.5.43
ChangeSet 1.801, 2002/10/17 14:05:48-07:00, greg@kroah.com

LSM: change all security bprm related calls to the new format.


diff -Nru a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c
--- a/arch/ppc64/kernel/sys_ppc32.c Thu Oct 17 14:19:04 2002
+++ b/arch/ppc64/kernel/sys_ppc32.c Thu Oct 17 14:19:04 2002
@@ -3518,8 +3518,7 @@
if ((retval = bprm.envc) < 0)
goto out_mm;

- retval = security_ops->bprm_alloc_security(&bprm);
- if (retval)
+ if ((retval = security_bprm_alloc(&bprm)))
goto out;

retval = prepare_binprm(&bprm);
@@ -3542,7 +3541,7 @@
retval = search_binary_handler(&bprm,regs);
if (retval >= 0) {
/* execve success */
- security_ops->bprm_free_security(&bprm);
+ security_bprm_free(&bprm);
return retval;
}

@@ -3555,7 +3554,7 @@
}

if (bprm.security)
- security_ops->bprm_free_security(&bprm);
+ security_bprm_free(&bprm);

out_mm:
mmdrop(bprm.mm);
diff -Nru a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
--- a/arch/sparc64/kernel/sys_sparc32.c Thu Oct 17 14:19:04 2002
+++ b/arch/sparc64/kernel/sys_sparc32.c Thu Oct 17 14:19:04 2002
@@ -2964,8 +2964,7 @@
if ((retval = bprm.envc) < 0)
goto out_mm;

- retval = security_ops->bprm_alloc_security(&bprm);
- if (retval)
+ if ((retval = security_bprm_alloc(&bprm)))
goto out;

retval = prepare_binprm(&bprm);
@@ -2988,7 +2987,7 @@
retval = search_binary_handler(&bprm, regs);
if (retval >= 0) {
/* execve success */
- security_ops->bprm_free_security(&bprm);
+ security_bprm_free(&bprm);
return retval;
}

@@ -3001,7 +3000,7 @@
}

if (bprm.security)
- security_ops->bprm_free_security(&bprm);
+ security_bprm_free(&bprm);

out_mm:
mmdrop(bprm.mm);
diff -Nru a/fs/exec.c b/fs/exec.c
--- a/fs/exec.c Thu Oct 17 14:19:04 2002
+++ b/fs/exec.c Thu Oct 17 14:19:04 2002
@@ -819,8 +819,7 @@
}

/* fill in binprm security blob */
- retval = security_ops->bprm_set_security(bprm);
- if (retval)
+ if ((retval = security_bprm_set(bprm)))
return retval;

memset(bprm->buf,0,BINPRM_BUF_SIZE);
@@ -868,7 +867,7 @@
if(do_unlock)
unlock_kernel();

- security_ops->bprm_compute_creds(bprm);
+ security_bprm_compute_creds(bprm);
}

void remove_arg_zero(struct linux_binprm *bprm)
@@ -937,8 +936,7 @@
}
}
#endif
- retval = security_ops->bprm_check_security(bprm);
- if (retval)
+ if ((retval = security_bprm_check(bprm)))
return retval;

/* kernel module loader fixup */
@@ -1034,8 +1032,7 @@
if ((retval = bprm.envc) < 0)
goto out_mm;

- retval = security_ops->bprm_alloc_security(&bprm);
- if (retval)
+ if ((retval = security_bprm_alloc(&bprm)))
goto out;

retval = prepare_binprm(&bprm);
@@ -1058,7 +1055,7 @@
retval = search_binary_handler(&bprm,regs);
if (retval >= 0) {
/* execve success */
- security_ops->bprm_free_security(&bprm);
+ security_bprm_free(&bprm);
return retval;
}

@@ -1071,7 +1068,7 @@
}

if (bprm.security)
- security_ops->bprm_free_security(&bprm);
+ security_bprm_free(&bprm);

out_mm:
mmdrop(bprm.mm);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:30    [W:0.038 / U:13.044 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site