Various minor type, prototype tweaks -- clean up cruft due to lack of
type checking on entry points (to be introduced shortly). Obtained from: TrustedBSD Project Sponsored by: DARPA, Network Associates Laboratories
This commit is contained in:
parent
5f4c5b500f
commit
1979061b56
@ -559,7 +559,7 @@ mac_biba_element_to_string(char *string, size_t size,
|
||||
"%d+", bit);
|
||||
}
|
||||
if (string[pos - 1] == '+' || string[pos - 1] == ':')
|
||||
string[--pos] = NULL;
|
||||
string[--pos] = '\0';
|
||||
return (pos);
|
||||
|
||||
default:
|
||||
@ -1360,7 +1360,7 @@ mac_biba_create_cred(struct ucred *cred_parent, struct ucred *cred_child)
|
||||
|
||||
static void
|
||||
mac_biba_execve_transition(struct ucred *old, struct ucred *new,
|
||||
struct vnode *vp, struct mac *vnodelabel)
|
||||
struct vnode *vp, struct label *vnodelabel)
|
||||
{
|
||||
struct mac_biba *source, *dest;
|
||||
|
||||
@ -1373,7 +1373,7 @@ mac_biba_execve_transition(struct ucred *old, struct ucred *new,
|
||||
|
||||
static int
|
||||
mac_biba_execve_will_transition(struct ucred *old, struct vnode *vp,
|
||||
struct mac *vnodelabel)
|
||||
struct label *vnodelabel)
|
||||
{
|
||||
|
||||
return (0);
|
||||
@ -1802,7 +1802,7 @@ mac_biba_check_socket_deliver(struct socket *so, struct label *socketlabel,
|
||||
}
|
||||
|
||||
static int
|
||||
mac_biba_check_socket_relabel(struct ucred *cred, struct socket *socket,
|
||||
mac_biba_check_socket_relabel(struct ucred *cred, struct socket *so,
|
||||
struct label *socketlabel, struct label *newlabel)
|
||||
{
|
||||
struct mac_biba *subj, *obj, *new;
|
||||
|
@ -459,8 +459,8 @@ mac_bsdextended_check_vnode_link(struct ucred *cred, struct vnode *dvp,
|
||||
if (error)
|
||||
return (error);
|
||||
error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VWRITE);
|
||||
if (error)
|
||||
return (error);
|
||||
if (error)
|
||||
return (error);
|
||||
|
||||
error = VOP_GETATTR(vp, &vap, cred, curthread);
|
||||
if (error)
|
||||
|
@ -477,7 +477,7 @@ mac_none_check_cred_visible(struct ucred *u1, struct ucred *u2)
|
||||
|
||||
static int
|
||||
mac_none_check_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet,
|
||||
struct label *newlabel)
|
||||
struct label *ifnetlabel, struct label *newlabel)
|
||||
{
|
||||
|
||||
return (0);
|
||||
|
@ -477,7 +477,7 @@ mac_none_check_cred_visible(struct ucred *u1, struct ucred *u2)
|
||||
|
||||
static int
|
||||
mac_none_check_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet,
|
||||
struct label *newlabel)
|
||||
struct label *ifnetlabel, struct label *newlabel)
|
||||
{
|
||||
|
||||
return (0);
|
||||
|
@ -484,8 +484,8 @@ mac_test_externalize_label(struct label *label, char *element_name,
|
||||
}
|
||||
|
||||
static int
|
||||
mac_test_internalize_label(struct label *label, struct mac *mac,
|
||||
char *element_name, char *element_data, int *claimed)
|
||||
mac_test_internalize_label(struct label *label, char *element_name,
|
||||
char *element_data, int *claimed)
|
||||
{
|
||||
|
||||
atomic_add_int(&internalize_count, 1);
|
||||
|
Loading…
x
Reference in New Issue
Block a user