From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org, linux-security-module@wirex.com
Subject: Re: [PATCH] LSM changes for 2.5.43
Date: Thu, 17 Oct 2002 14:29:58 -0700 [thread overview]
Message-ID: <20021017212958.GE1125@kroah.com> (raw)
In-Reply-To: <20021017212924.GD1125@kroah.com>
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);
next prev parent reply other threads:[~2002-10-17 21:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-10-17 21:26 [BK PATCH] " Greg KH
2002-10-17 21:28 ` [PATCH] " Greg KH
2002-10-17 21:28 ` Greg KH
2002-10-17 21:29 ` Greg KH
2002-10-17 21:29 ` Greg KH [this message]
2002-10-17 21:30 ` Greg KH
2002-10-17 21:30 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20021017212958.GE1125@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@wirex.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®