45c45
< __FBSDID("$FreeBSD: head/sys/security/mac/mac_framework.c 122454 2003-11-11 03:40:04Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/security/mac/mac_framework.c 122524 2003-11-12 03:14:31Z rwatson $");
258a259
> mac_labelzone_init();
568c569
< error = mac_externalize_cred_label(&tcred->cr_label, elements,
---
> error = mac_externalize_cred_label(tcred->cr_label, elements,
605c606
< error = mac_externalize_cred_label(&td->td_ucred->cr_label,
---
> error = mac_externalize_cred_label(td->td_ucred->cr_label,
622c623
< struct label intlabel;
---
> struct label *intlabel;
643,644c644,645
< mac_init_cred_label(&intlabel);
< error = mac_internalize_cred_label(&intlabel, buffer);
---
> intlabel = mac_cred_label_alloc();
> error = mac_internalize_cred_label(intlabel, buffer);
646,649c647,648
< if (error) {
< mac_destroy_cred_label(&intlabel);
< return (error);
< }
---
> if (error)
> goto out;
657c656
< error = mac_check_cred_relabel(oldcred, &intlabel);
---
> error = mac_check_cred_relabel(oldcred, intlabel);
666c665
< mac_relabel_cred(newcred, &intlabel);
---
> mac_relabel_cred(newcred, intlabel);
686c685
< mac_destroy_cred_label(&intlabel);
---
> mac_cred_label_free(intlabel);
697c696
< struct label intlabel;
---
> struct label *intlabel;
732c731
< mac_init_vnode_label(&intlabel);
---
> intlabel = mac_vnode_label_alloc();
735c734
< mac_copy_vnode_label(&vp->v_label, &intlabel);
---
> mac_copy_vnode_label(vp->v_label, intlabel);
742c741
< mac_init_pipe_label(&intlabel);
---
> intlabel = mac_pipe_label_alloc();
745c744
< mac_copy_pipe_label(pipe->pipe_label, &intlabel);
---
> mac_copy_pipe_label(pipe->pipe_label, intlabel);
759c758
< error = mac_externalize_vnode_label(&intlabel,
---
> error = mac_externalize_vnode_label(intlabel,
761c760
< mac_destroy_vnode_label(&intlabel);
---
> mac_vnode_label_free(intlabel);
764c763
< error = mac_externalize_pipe_label(&intlabel, elements,
---
> error = mac_externalize_pipe_label(intlabel, elements,
766c765
< mac_destroy_pipe_label(&intlabel);
---
> mac_pipe_label_free(intlabel);
791c790
< struct label intlabel;
---
> struct label *intlabel;
818,820c817,819
< mac_init_vnode_label(&intlabel);
< mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
< error = mac_externalize_vnode_label(&intlabel, elements, buffer,
---
> intlabel = mac_vnode_label_alloc();
> mac_copy_vnode_label(nd.ni_vp->v_label, intlabel);
> error = mac_externalize_vnode_label(intlabel, elements, buffer,
824c823
< mac_destroy_vnode_label(&intlabel);
---
> mac_vnode_label_free(intlabel);
846c845
< struct label intlabel;
---
> struct label *intlabel;
873,875c872,874
< mac_init_vnode_label(&intlabel);
< mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
< error = mac_externalize_vnode_label(&intlabel, elements, buffer,
---
> intlabel = mac_vnode_label_alloc();
> mac_copy_vnode_label(nd.ni_vp->v_label, intlabel);
> error = mac_externalize_vnode_label(intlabel, elements, buffer,
878c877
< mac_destroy_vnode_label(&intlabel);
---
> mac_vnode_label_free(intlabel);
898c897
< struct label intlabel;
---
> struct label *intlabel;
931,932c930,931
< mac_init_vnode_label(&intlabel);
< error = mac_internalize_vnode_label(&intlabel, buffer);
---
> intlabel = mac_vnode_label_alloc();
> error = mac_internalize_vnode_label(intlabel, buffer);
934c933
< mac_destroy_vnode_label(&intlabel);
---
> mac_vnode_label_free(intlabel);
941c940
< mac_destroy_vnode_label(&intlabel);
---
> mac_vnode_label_free(intlabel);
946c945
< error = vn_setlabel(vp, &intlabel, td->td_ucred);
---
> error = vn_setlabel(vp, intlabel, td->td_ucred);
950c949
< mac_destroy_vnode_label(&intlabel);
---
> mac_vnode_label_free(intlabel);
954,955c953,954
< mac_init_pipe_label(&intlabel);
< error = mac_internalize_pipe_label(&intlabel, buffer);
---
> intlabel = mac_pipe_label_alloc();
> error = mac_internalize_pipe_label(intlabel, buffer);
960c959
< &intlabel);
---
> intlabel);
964c963
< mac_destroy_pipe_label(&intlabel);
---
> mac_pipe_label_free(intlabel);
986c985
< struct label intlabel;
---
> struct label *intlabel;
1008,1009c1007,1008
< mac_init_vnode_label(&intlabel);
< error = mac_internalize_vnode_label(&intlabel, buffer);
---
> intlabel = mac_vnode_label_alloc();
> error = mac_internalize_vnode_label(intlabel, buffer);
1011,1014c1010,1011
< if (error) {
< mac_destroy_vnode_label(&intlabel);
< return (error);
< }
---
> if (error)
> goto out;
1024c1021
< error = vn_setlabel(nd.ni_vp, &intlabel,
---
> error = vn_setlabel(nd.ni_vp, intlabel,
1031,1032c1028,1029
< mac_destroy_vnode_label(&intlabel);
<
---
> out:
> mac_vnode_label_free(intlabel);
1042c1039
< struct label intlabel;
---
> struct label *intlabel;
1064,1065c1061,1062
< mac_init_vnode_label(&intlabel);
< error = mac_internalize_vnode_label(&intlabel, buffer);
---
> intlabel = mac_vnode_label_alloc();
> error = mac_internalize_vnode_label(intlabel, buffer);
1067,1070c1064,1065
< if (error) {
< mac_destroy_vnode_label(&intlabel);
< return (error);
< }
---
> if (error)
> goto out;
1080c1075
< error = vn_setlabel(nd.ni_vp, &intlabel,
---
> error = vn_setlabel(nd.ni_vp, intlabel,
1087,1088c1082,1083
< mac_destroy_vnode_label(&intlabel);
<
---
> out:
> mac_vnode_label_free(intlabel);