38c38
< * $FreeBSD: head/sys/security/mac_test/mac_test.c 173112 2007-10-28 18:33:31Z rwatson $
---
> * $FreeBSD: head/sys/security/mac_test/mac_test.c 173138 2007-10-29 13:33:06Z rwatson $
152c152
< * Label operations.
---
> * Functions that span multiple entry points.
154,156c154,157
< COUNTER_DECL(bpfdesc_init_label);
< static void
< test_bpfdesc_init_label(struct label *label)
---
> COUNTER_DECL(internalize_label);
> static int
> test_internalize_label(struct label *label, char *element_name,
> char *element_data, int *claimed)
159,161c160,161
< LABEL_INIT(label, MAGIC_BPF);
< COUNTER_INC(bpfdesc_init_label);
< }
---
> LABEL_NOTFREE(label);
> COUNTER_INC(internalize_label);
163,169c163
< COUNTER_DECL(cred_init_label);
< static void
< test_cred_init_label(struct label *label)
< {
<
< LABEL_INIT(label, MAGIC_CRED);
< COUNTER_INC(cred_init_label);
---
> return (0);
172,190c166,170
< COUNTER_DECL(devfs_init_label);
< static void
< test_devfs_init_label(struct label *label)
< {
<
< LABEL_INIT(label, MAGIC_DEVFS);
< COUNTER_INC(devfs_init_label);
< }
<
< COUNTER_DECL(ifnet_init_label);
< static void
< test_ifnet_init_label(struct label *label)
< {
<
< LABEL_INIT(label, MAGIC_IFNET);
< COUNTER_INC(ifnet_init_label);
< }
<
< COUNTER_DECL(inpcb_init_label);
---
> /*
> * Object-specific entry point implementations are sorted alphabetically by
> * object type name and then by operation.
> */
> COUNTER_DECL(bpfdesc_check_receive);
192c172,173
< test_inpcb_init_label(struct label *label, int flag)
---
> test_bpfdesc_check_receive(struct bpf_d *bpf_d, struct label *bpflabel,
> struct ifnet *ifp, struct label *ifplabel)
195,198c176,178
< if (flag & M_WAITOK)
< WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
< "test_inpcb_init_label() at %s:%d", __FILE__,
< __LINE__);
---
> LABEL_CHECK(bpflabel, MAGIC_BPF);
> LABEL_CHECK(ifplabel, MAGIC_IFNET);
> COUNTER_INC(bpfdesc_check_receive);
200,201d179
< LABEL_INIT(label, MAGIC_INPCB);
< COUNTER_INC(inpcb_init_label);
205c183
< COUNTER_DECL(sysvmsg_init_label);
---
> COUNTER_DECL(bpfdesc_create);
207c185,186
< test_sysvmsg_init_label(struct label *label)
---
> test_bpfdesc_create(struct ucred *cred, struct bpf_d *bpf_d,
> struct label *bpflabel)
209,211d187
< LABEL_INIT(label, MAGIC_SYSV_MSG);
< COUNTER_INC(sysvmsg_init_label);
< }
213,218c189,191
< COUNTER_DECL(sysvmsq_init_label);
< static void
< test_sysvmsq_init_label(struct label *label)
< {
< LABEL_INIT(label, MAGIC_SYSV_MSQ);
< COUNTER_INC(sysvmsq_init_label);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(bpflabel, MAGIC_BPF);
> COUNTER_INC(bpfdesc_create);
221c194
< COUNTER_DECL(sysvsem_init_label);
---
> COUNTER_DECL(bpfdesc_create_mbuf);
223c196,197
< test_sysvsem_init_label(struct label *label)
---
> test_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct label *bpflabel,
> struct mbuf *mbuf, struct label *mbuflabel)
225,226c199,202
< LABEL_INIT(label, MAGIC_SYSV_SEM);
< COUNTER_INC(sysvsem_init_label);
---
>
> LABEL_CHECK(bpflabel, MAGIC_BPF);
> LABEL_CHECK(mbuflabel, MAGIC_MBUF);
> COUNTER_INC(bpfdesc_create_mbuf);
229c205
< COUNTER_DECL(sysvshm_init_label);
---
> COUNTER_DECL(bpfdesc_destroy_label);
231c207
< test_sysvshm_init_label(struct label *label)
---
> test_bpfdesc_destroy_label(struct label *label)
233,235d208
< LABEL_INIT(label, MAGIC_SYSV_SHM);
< COUNTER_INC(sysvshm_init_label);
< }
237,249c210,211
< COUNTER_DECL(ipq_init_label);
< static int
< test_ipq_init_label(struct label *label, int flag)
< {
<
< if (flag & M_WAITOK)
< WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
< "test_ipq_init_label() at %s:%d", __FILE__,
< __LINE__);
<
< LABEL_INIT(label, MAGIC_IPQ);
< COUNTER_INC(ipq_init_label);
< return (0);
---
> LABEL_DESTROY(label, MAGIC_BPF);
> COUNTER_INC(bpfdesc_destroy_label);
252,267c214
< COUNTER_DECL(mbuf_init_label);
< static int
< test_mbuf_init_label(struct label *label, int flag)
< {
<
< if (flag & M_WAITOK)
< WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
< "test_mbuf_init_label() at %s:%d", __FILE__,
< __LINE__);
<
< LABEL_INIT(label, MAGIC_MBUF);
< COUNTER_INC(mbuf_init_label);
< return (0);
< }
<
< COUNTER_DECL(mount_init_label);
---
> COUNTER_DECL(bpfdesc_init_label);
269c216
< test_mount_init_label(struct label *label)
---
> test_bpfdesc_init_label(struct label *label)
272,273c219,220
< LABEL_INIT(label, MAGIC_MOUNT);
< COUNTER_INC(mount_init_label);
---
> LABEL_INIT(label, MAGIC_BPF);
> COUNTER_INC(bpfdesc_init_label);
276c223
< COUNTER_DECL(socket_init_label);
---
> COUNTER_DECL(cred_check_relabel);
278c225
< test_socket_init_label(struct label *label, int flag)
---
> test_cred_check_relabel(struct ucred *cred, struct label *newlabel)
281,284c228,230
< if (flag & M_WAITOK)
< WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
< "test_socket_init_label() at %s:%d", __FILE__,
< __LINE__);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(newlabel, MAGIC_CRED);
> COUNTER_INC(cred_check_relabel);
286,287d231
< LABEL_INIT(label, MAGIC_SOCKET);
< COUNTER_INC(socket_init_label);
291c235
< COUNTER_DECL(socketpeer_init_label);
---
> COUNTER_DECL(cred_check_visible);
293c237
< test_socketpeer_init_label(struct label *label, int flag)
---
> test_cred_check_visible(struct ucred *u1, struct ucred *u2)
296,299c240,242
< if (flag & M_WAITOK)
< WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
< "test_socketpeer_init_label() at %s:%d", __FILE__,
< __LINE__);
---
> LABEL_CHECK(u1->cr_label, MAGIC_CRED);
> LABEL_CHECK(u2->cr_label, MAGIC_CRED);
> COUNTER_INC(cred_check_visible);
301,302d243
< LABEL_INIT(label, MAGIC_SOCKET);
< COUNTER_INC(socketpeer_init_label);
306c247
< COUNTER_DECL(pipe_init_label);
---
> COUNTER_DECL(cred_copy_label);
308c249
< test_pipe_init_label(struct label *label)
---
> test_cred_copy_label(struct label *src, struct label *dest)
311,312c252,254
< LABEL_INIT(label, MAGIC_PIPE);
< COUNTER_INC(pipe_init_label);
---
> LABEL_CHECK(src, MAGIC_CRED);
> LABEL_CHECK(dest, MAGIC_CRED);
> COUNTER_INC(cred_copy_label);
315,364d256
< COUNTER_DECL(posixsem_init_label);
< static void
< test_posixsem_init_label(struct label *label)
< {
<
< LABEL_INIT(label, MAGIC_POSIX_SEM);
< COUNTER_INC(posixsem_init_label);
< }
<
< COUNTER_DECL(proc_init_label);
< static void
< test_proc_init_label(struct label *label)
< {
<
< LABEL_INIT(label, MAGIC_PROC);
< COUNTER_INC(proc_init_label);
< }
<
< COUNTER_DECL(syncache_init_label);
< static int
< test_syncache_init_label(struct label *label, int flag)
< {
<
< if (flag & M_WAITOK)
< WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
< "test_syncache_init_label() at %s:%d", __FILE__,
< __LINE__);
< LABEL_INIT(label, MAGIC_SYNCACHE);
< COUNTER_INC(syncache_init_label);
< return (0);
< }
<
< COUNTER_DECL(vnode_init_label);
< static void
< test_vnode_init_label(struct label *label)
< {
<
< LABEL_INIT(label, MAGIC_VNODE);
< COUNTER_INC(vnode_init_label);
< }
<
< COUNTER_DECL(bpfdesc_destroy_label);
< static void
< test_bpfdesc_destroy_label(struct label *label)
< {
<
< LABEL_DESTROY(label, MAGIC_BPF);
< COUNTER_INC(bpfdesc_destroy_label);
< }
<
374,376c266,269
< COUNTER_DECL(devfs_destroy_label);
< static void
< test_devfs_destroy_label(struct label *label)
---
> COUNTER_DECL(cred_externalize_label);
> static int
> test_cred_externalize_label(struct label *label, char *element_name,
> struct sbuf *sb, int *claimed)
379,381c272,273
< LABEL_DESTROY(label, MAGIC_DEVFS);
< COUNTER_INC(devfs_destroy_label);
< }
---
> LABEL_CHECK(label, MAGIC_CRED);
> COUNTER_INC(cred_externalize_label);
383,389c275
< COUNTER_DECL(ifnet_destroy_label);
< static void
< test_ifnet_destroy_label(struct label *label)
< {
<
< LABEL_DESTROY(label, MAGIC_IFNET);
< COUNTER_INC(ifnet_destroy_label);
---
> return (0);
392c278
< COUNTER_DECL(inpcb_destroy_label);
---
> COUNTER_DECL(cred_init_label);
394c280
< test_inpcb_destroy_label(struct label *label)
---
> test_cred_init_label(struct label *label)
397,398c283,284
< LABEL_DESTROY(label, MAGIC_INPCB);
< COUNTER_INC(inpcb_destroy_label);
---
> LABEL_INIT(label, MAGIC_CRED);
> COUNTER_INC(cred_init_label);
401c287
< COUNTER_DECL(syncache_destroy_label);
---
> COUNTER_DECL(cred_relabel);
403c289
< test_syncache_destroy_label(struct label *label)
---
> test_cred_relabel(struct ucred *cred, struct label *newlabel)
406,407c292,294
< LABEL_DESTROY(label, MAGIC_SYNCACHE);
< COUNTER_INC(syncache_destroy_label);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(newlabel, MAGIC_CRED);
> COUNTER_INC(cred_relabel);
410c297
< COUNTER_DECL(sysvmsg_destroy_label);
---
> COUNTER_DECL(devfs_create_device);
412c299,300
< test_sysvmsg_destroy_label(struct label *label)
---
> test_devfs_create_device(struct ucred *cred, struct mount *mp,
> struct cdev *dev, struct devfs_dirent *de, struct label *delabel)
415,416c303,306
< LABEL_DESTROY(label, MAGIC_SYSV_MSG);
< COUNTER_INC(sysvmsg_destroy_label);
---
> if (cred != NULL)
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(delabel, MAGIC_DEVFS);
> COUNTER_INC(devfs_create_device);
419c309
< COUNTER_DECL(sysvmsq_destroy_label);
---
> COUNTER_DECL(devfs_create_directory);
421c311,312
< test_sysvmsq_destroy_label(struct label *label)
---
> test_devfs_create_directory(struct mount *mp, char *dirname,
> int dirnamelen, struct devfs_dirent *de, struct label *delabel)
424,425c315,316
< LABEL_DESTROY(label, MAGIC_SYSV_MSQ);
< COUNTER_INC(sysvmsq_destroy_label);
---
> LABEL_CHECK(delabel, MAGIC_DEVFS);
> COUNTER_INC(devfs_create_directory);
428c319
< COUNTER_DECL(sysvsem_destroy_label);
---
> COUNTER_DECL(devfs_create_symlink);
430c321,323
< test_sysvsem_destroy_label(struct label *label)
---
> test_devfs_create_symlink(struct ucred *cred, struct mount *mp,
> struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de,
> struct label *delabel)
433,434c326,329
< LABEL_DESTROY(label, MAGIC_SYSV_SEM);
< COUNTER_INC(sysvsem_destroy_label);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(ddlabel, MAGIC_DEVFS);
> LABEL_CHECK(delabel, MAGIC_DEVFS);
> COUNTER_INC(devfs_create_symlink);
437c332
< COUNTER_DECL(sysvshm_destroy_label);
---
> COUNTER_DECL(devfs_destroy_label);
439c334
< test_sysvshm_destroy_label(struct label *label)
---
> test_devfs_destroy_label(struct label *label)
442,443c337,338
< LABEL_DESTROY(label, MAGIC_SYSV_SHM);
< COUNTER_INC(sysvshm_destroy_label);
---
> LABEL_DESTROY(label, MAGIC_DEVFS);
> COUNTER_INC(devfs_destroy_label);
446c341
< COUNTER_DECL(ipq_destroy_label);
---
> COUNTER_DECL(devfs_init_label);
448c343
< test_ipq_destroy_label(struct label *label)
---
> test_devfs_init_label(struct label *label)
451,452c346,347
< LABEL_DESTROY(label, MAGIC_IPQ);
< COUNTER_INC(ipq_destroy_label);
---
> LABEL_INIT(label, MAGIC_DEVFS);
> COUNTER_INC(devfs_init_label);
455c350
< COUNTER_DECL(mbuf_destroy_label);
---
> COUNTER_DECL(devfs_update);
457c352,353
< test_mbuf_destroy_label(struct label *label)
---
> test_devfs_update(struct mount *mp, struct devfs_dirent *devfs_dirent,
> struct label *direntlabel, struct vnode *vp, struct label *vplabel)
460,469c356,358
< /*
< * If we're loaded dynamically, there may be mbufs in flight that
< * didn't have label storage allocated for them. Handle this
< * gracefully.
< */
< if (label == NULL)
< return;
<
< LABEL_DESTROY(label, MAGIC_MBUF);
< COUNTER_INC(mbuf_destroy_label);
---
> LABEL_CHECK(direntlabel, MAGIC_DEVFS);
> LABEL_CHECK(vplabel, MAGIC_VNODE);
> COUNTER_INC(devfs_update);
472c361
< COUNTER_DECL(mount_destroy_label);
---
> COUNTER_DECL(devfs_vnode_associate);
474c363,365
< test_mount_destroy_label(struct label *label)
---
> test_devfs_vnode_associate(struct mount *mp, struct label *mplabel,
> struct devfs_dirent *de, struct label *delabel, struct vnode *vp,
> struct label *vplabel)
477,478c368,371
< LABEL_DESTROY(label, MAGIC_MOUNT);
< COUNTER_INC(mount_destroy_label);
---
> LABEL_CHECK(mplabel, MAGIC_MOUNT);
> LABEL_CHECK(delabel, MAGIC_DEVFS);
> LABEL_CHECK(vplabel, MAGIC_VNODE);
> COUNTER_INC(devfs_vnode_associate);
481,483c374,377
< COUNTER_DECL(socket_destroy_label);
< static void
< test_socket_destroy_label(struct label *label)
---
> COUNTER_DECL(ifnet_check_relabel);
> static int
> test_ifnet_check_relabel(struct ucred *cred, struct ifnet *ifp,
> struct label *ifplabel, struct label *newlabel)
486,488c380,383
< LABEL_DESTROY(label, MAGIC_SOCKET);
< COUNTER_INC(socket_destroy_label);
< }
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(ifplabel, MAGIC_IFNET);
> LABEL_CHECK(newlabel, MAGIC_IFNET);
> COUNTER_INC(ifnet_check_relabel);
490,496c385
< COUNTER_DECL(socketpeer_destroy_label);
< static void
< test_socketpeer_destroy_label(struct label *label)
< {
<
< LABEL_DESTROY(label, MAGIC_SOCKET);
< COUNTER_INC(socketpeer_destroy_label);
---
> return (0);
499,501c388,391
< COUNTER_DECL(pipe_destroy_label);
< static void
< test_pipe_destroy_label(struct label *label)
---
> COUNTER_DECL(ifnet_check_transmit);
> static int
> test_ifnet_check_transmit(struct ifnet *ifp, struct label *ifplabel,
> struct mbuf *m, struct label *mbuflabel)
504,506c394,396
< LABEL_DESTROY(label, MAGIC_PIPE);
< COUNTER_INC(pipe_destroy_label);
< }
---
> LABEL_CHECK(ifplabel, MAGIC_IFNET);
> LABEL_CHECK(mbuflabel, MAGIC_MBUF);
> COUNTER_INC(ifnet_check_transmit);
508,514c398
< COUNTER_DECL(posixsem_destroy_label);
< static void
< test_posixsem_destroy_label(struct label *label)
< {
<
< LABEL_DESTROY(label, MAGIC_POSIX_SEM);
< COUNTER_INC(posixsem_destroy_label);
---
> return (0);
517,544d400
< COUNTER_DECL(proc_destroy_label);
< static void
< test_proc_destroy_label(struct label *label)
< {
<
< LABEL_DESTROY(label, MAGIC_PROC);
< COUNTER_INC(proc_destroy_label);
< }
<
< COUNTER_DECL(vnode_destroy_label);
< static void
< test_vnode_destroy_label(struct label *label)
< {
<
< LABEL_DESTROY(label, MAGIC_VNODE);
< COUNTER_INC(vnode_destroy_label);
< }
<
< COUNTER_DECL(cred_copy_label);
< static void
< test_cred_copy_label(struct label *src, struct label *dest)
< {
<
< LABEL_CHECK(src, MAGIC_CRED);
< LABEL_CHECK(dest, MAGIC_CRED);
< COUNTER_INC(cred_copy_label);
< }
<
555c411
< COUNTER_DECL(mbuf_copy_label);
---
> COUNTER_DECL(ifnet_create);
557c413
< test_mbuf_copy_label(struct label *src, struct label *dest)
---
> test_ifnet_create(struct ifnet *ifp, struct label *ifplabel)
560,562c416,417
< LABEL_CHECK(src, MAGIC_MBUF);
< LABEL_CHECK(dest, MAGIC_MBUF);
< COUNTER_INC(mbuf_copy_label);
---
> LABEL_CHECK(ifplabel, MAGIC_IFNET);
> COUNTER_INC(ifnet_create);
565c420
< COUNTER_DECL(pipe_copy_label);
---
> COUNTER_DECL(ifnet_create_mbuf);
567c422,423
< test_pipe_copy_label(struct label *src, struct label *dest)
---
> test_ifnet_create_mbuf(struct ifnet *ifp, struct label *ifplabel,
> struct mbuf *m, struct label *mbuflabel)
570,572c426,428
< LABEL_CHECK(src, MAGIC_PIPE);
< LABEL_CHECK(dest, MAGIC_PIPE);
< COUNTER_INC(pipe_copy_label);
---
> LABEL_CHECK(ifplabel, MAGIC_IFNET);
> LABEL_CHECK(mbuflabel, MAGIC_MBUF);
> COUNTER_INC(ifnet_create_mbuf);
575c431
< COUNTER_DECL(socket_copy_label);
---
> COUNTER_DECL(ifnet_destroy_label);
577c433
< test_socket_copy_label(struct label *src, struct label *dest)
---
> test_ifnet_destroy_label(struct label *label)
580,582c436,437
< LABEL_CHECK(src, MAGIC_SOCKET);
< LABEL_CHECK(dest, MAGIC_SOCKET);
< COUNTER_INC(socket_copy_label);
---
> LABEL_DESTROY(label, MAGIC_IFNET);
> COUNTER_INC(ifnet_destroy_label);
585,606d439
< COUNTER_DECL(vnode_copy_label);
< static void
< test_vnode_copy_label(struct label *src, struct label *dest)
< {
<
< LABEL_CHECK(src, MAGIC_VNODE);
< LABEL_CHECK(dest, MAGIC_VNODE);
< COUNTER_INC(vnode_copy_label);
< }
<
< COUNTER_DECL(cred_externalize_label);
< static int
< test_cred_externalize_label(struct label *label, char *element_name,
< struct sbuf *sb, int *claimed)
< {
<
< LABEL_CHECK(label, MAGIC_CRED);
< COUNTER_INC(cred_externalize_label);
<
< return (0);
< }
<
619,622c452,454
< COUNTER_DECL(pipe_externalize_label);
< static int
< test_pipe_externalize_label(struct label *label, char *element_name,
< struct sbuf *sb, int *claimed)
---
> COUNTER_DECL(ifnet_init_label);
> static void
> test_ifnet_init_label(struct label *label)
625,628c457,458
< LABEL_CHECK(label, MAGIC_PIPE);
< COUNTER_INC(pipe_externalize_label);
<
< return (0);
---
> LABEL_INIT(label, MAGIC_IFNET);
> COUNTER_INC(ifnet_init_label);
631,634c461,464
< COUNTER_DECL(socket_externalize_label);
< static int
< test_socket_externalize_label(struct label *label, char *element_name,
< struct sbuf *sb, int *claimed)
---
> COUNTER_DECL(ifnet_relabel);
> static void
> test_ifnet_relabel(struct ucred *cred, struct ifnet *ifp,
> struct label *ifplabel, struct label *newlabel)
637,640c467,470
< LABEL_CHECK(label, MAGIC_SOCKET);
< COUNTER_INC(socket_externalize_label);
<
< return (0);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(ifplabel, MAGIC_IFNET);
> LABEL_CHECK(newlabel, MAGIC_IFNET);
> COUNTER_INC(ifnet_relabel);
643c473
< COUNTER_DECL(socketpeer_externalize_label);
---
> COUNTER_DECL(inpcb_check_deliver);
645,646c475,476
< test_socketpeer_externalize_label(struct label *label, char *element_name,
< struct sbuf *sb, int *claimed)
---
> test_inpcb_check_deliver(struct inpcb *inp, struct label *inplabel,
> struct mbuf *m, struct label *mlabel)
649,650c479,481
< LABEL_CHECK(label, MAGIC_SOCKET);
< COUNTER_INC(socketpeer_externalize_label);
---
> LABEL_CHECK(inplabel, MAGIC_INPCB);
> LABEL_CHECK(mlabel, MAGIC_MBUF);
> COUNTER_INC(inpcb_check_deliver);
655,658c486,489
< COUNTER_DECL(vnode_externalize_label);
< static int
< test_vnode_externalize_label(struct label *label, char *element_name,
< struct sbuf *sb, int *claimed)
---
> COUNTER_DECL(inpcb_create);
> static void
> test_inpcb_create(struct socket *so, struct label *solabel,
> struct inpcb *inp, struct label *inplabel)
661,664c492,494
< LABEL_CHECK(label, MAGIC_VNODE);
< COUNTER_INC(vnode_externalize_label);
<
< return (0);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> LABEL_CHECK(inplabel, MAGIC_INPCB);
> COUNTER_INC(inpcb_create);
667,670c497,500
< COUNTER_DECL(internalize_label);
< static int
< test_internalize_label(struct label *label, char *element_name,
< char *element_data, int *claimed)
---
> COUNTER_DECL(inpcb_create_mbuf);
> static void
> test_inpcb_create_mbuf(struct inpcb *inp, struct label *inplabel,
> struct mbuf *m, struct label *mlabel)
673,676c503,505
< LABEL_NOTFREE(label);
< COUNTER_INC(internalize_label);
<
< return (0);
---
> LABEL_CHECK(inplabel, MAGIC_INPCB);
> LABEL_CHECK(mlabel, MAGIC_MBUF);
> COUNTER_INC(inpcb_create_mbuf);
679,683c508
< /*
< * Labeling event operations: file system objects, and things that look
< * a lot like file system objects.
< */
< COUNTER_DECL(devfs_vnode_associate);
---
> COUNTER_DECL(inpcb_destroy_label);
685,687c510
< test_devfs_vnode_associate(struct mount *mp, struct label *mplabel,
< struct devfs_dirent *de, struct label *delabel, struct vnode *vp,
< struct label *vplabel)
---
> test_inpcb_destroy_label(struct label *label)
690,693c513,514
< LABEL_CHECK(mplabel, MAGIC_MOUNT);
< LABEL_CHECK(delabel, MAGIC_DEVFS);
< LABEL_CHECK(vplabel, MAGIC_VNODE);
< COUNTER_INC(devfs_vnode_associate);
---
> LABEL_DESTROY(label, MAGIC_INPCB);
> COUNTER_INC(inpcb_destroy_label);
696c517
< COUNTER_DECL(vnode_associate_extattr);
---
> COUNTER_DECL(inpcb_init_label);
698,699c519
< test_vnode_associate_extattr(struct mount *mp, struct label *mplabel,
< struct vnode *vp, struct label *vplabel)
---
> test_inpcb_init_label(struct label *label, int flag)
702,704c522,525
< LABEL_CHECK(mplabel, MAGIC_MOUNT);
< LABEL_CHECK(vplabel, MAGIC_VNODE);
< COUNTER_INC(vnode_associate_extattr);
---
> if (flag & M_WAITOK)
> WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
> "test_inpcb_init_label() at %s:%d", __FILE__,
> __LINE__);
705a527,528
> LABEL_INIT(label, MAGIC_INPCB);
> COUNTER_INC(inpcb_init_label);
709c532
< COUNTER_DECL(vnode_associate_singlelabel);
---
> COUNTER_DECL(inpcb_sosetlabel);
711,712c534,535
< test_vnode_associate_singlelabel(struct mount *mp, struct label *mplabel,
< struct vnode *vp, struct label *vplabel)
---
> test_inpcb_sosetlabel(struct socket *so, struct label *solabel,
> struct inpcb *inp, struct label *inplabel)
715,717c538,540
< LABEL_CHECK(mplabel, MAGIC_MOUNT);
< LABEL_CHECK(vplabel, MAGIC_VNODE);
< COUNTER_INC(vnode_associate_singlelabel);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> LABEL_CHECK(inplabel, MAGIC_INPCB);
> COUNTER_INC(inpcb_sosetlabel);
720c543
< COUNTER_DECL(devfs_create_device);
---
> COUNTER_DECL(ipq_create);
722,723c545,546
< test_devfs_create_device(struct ucred *cred, struct mount *mp,
< struct cdev *dev, struct devfs_dirent *de, struct label *delabel)
---
> test_ipq_create(struct mbuf *fragment, struct label *fragmentlabel,
> struct ipq *ipq, struct label *ipqlabel)
726,729c549,551
< if (cred != NULL)
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(delabel, MAGIC_DEVFS);
< COUNTER_INC(devfs_create_device);
---
> LABEL_CHECK(fragmentlabel, MAGIC_MBUF);
> LABEL_CHECK(ipqlabel, MAGIC_IPQ);
> COUNTER_INC(ipq_create);
732c554
< COUNTER_DECL(devfs_create_directory);
---
> COUNTER_DECL(ipq_destroy_label);
734,735c556
< test_devfs_create_directory(struct mount *mp, char *dirname,
< int dirnamelen, struct devfs_dirent *de, struct label *delabel)
---
> test_ipq_destroy_label(struct label *label)
738,739c559,560
< LABEL_CHECK(delabel, MAGIC_DEVFS);
< COUNTER_INC(devfs_create_directory);
---
> LABEL_DESTROY(label, MAGIC_IPQ);
> COUNTER_INC(ipq_destroy_label);
742,746c563,565
< COUNTER_DECL(devfs_create_symlink);
< static void
< test_devfs_create_symlink(struct ucred *cred, struct mount *mp,
< struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de,
< struct label *delabel)
---
> COUNTER_DECL(ipq_init_label);
> static int
> test_ipq_init_label(struct label *label, int flag)
749,752c568,575
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(ddlabel, MAGIC_DEVFS);
< LABEL_CHECK(delabel, MAGIC_DEVFS);
< COUNTER_INC(devfs_create_symlink);
---
> if (flag & M_WAITOK)
> WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
> "test_ipq_init_label() at %s:%d", __FILE__,
> __LINE__);
>
> LABEL_INIT(label, MAGIC_IPQ);
> COUNTER_INC(ipq_init_label);
> return (0);
755c578
< COUNTER_DECL(vnode_create_extattr);
---
> COUNTER_DECL(ipq_match);
757,759c580,581
< test_vnode_create_extattr(struct ucred *cred, struct mount *mp,
< struct label *mplabel, struct vnode *dvp, struct label *dvplabel,
< struct vnode *vp, struct label *vplabel, struct componentname *cnp)
---
> test_ipq_match(struct mbuf *fragment, struct label *fragmentlabel,
> struct ipq *ipq, struct label *ipqlabel)
762,765c584,586
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(mplabel, MAGIC_MOUNT);
< LABEL_CHECK(dvplabel, MAGIC_VNODE);
< COUNTER_INC(vnode_create_extattr);
---
> LABEL_CHECK(fragmentlabel, MAGIC_MBUF);
> LABEL_CHECK(ipqlabel, MAGIC_IPQ);
> COUNTER_INC(ipq_match);
767c588
< return (0);
---
> return (1);
770c591
< COUNTER_DECL(mount_create);
---
> COUNTER_DECL(ipq_reassemble);
772,773c593,594
< test_mount_create(struct ucred *cred, struct mount *mp,
< struct label *mplabel)
---
> test_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel,
> struct mbuf *datagram, struct label *datagramlabel)
776,778c597,599
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(mplabel, MAGIC_MOUNT);
< COUNTER_INC(mount_create);
---
> LABEL_CHECK(ipqlabel, MAGIC_IPQ);
> LABEL_CHECK(datagramlabel, MAGIC_MBUF);
> COUNTER_INC(ipq_reassemble);
781c602
< COUNTER_DECL(vnode_relabel);
---
> COUNTER_DECL(ipq_update);
783,784c604,605
< test_vnode_relabel(struct ucred *cred, struct vnode *vp,
< struct label *vplabel, struct label *label)
---
> test_ipq_update(struct mbuf *fragment, struct label *fragmentlabel,
> struct ipq *ipq, struct label *ipqlabel)
787,790c608,610
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(vplabel, MAGIC_VNODE);
< LABEL_CHECK(label, MAGIC_VNODE);
< COUNTER_INC(vnode_relabel);
---
> LABEL_CHECK(fragmentlabel, MAGIC_MBUF);
> LABEL_CHECK(ipqlabel, MAGIC_IPQ);
> COUNTER_INC(ipq_update);
793c613
< COUNTER_DECL(vnode_setlabel_extattr);
---
> COUNTER_DECL(kenv_check_dump);
795,796c615
< test_vnode_setlabel_extattr(struct ucred *cred, struct vnode *vp,
< struct label *vplabel, struct label *intlabel)
---
> test_kenv_check_dump(struct ucred *cred)
800,802c619
< LABEL_CHECK(vplabel, MAGIC_VNODE);
< LABEL_CHECK(intlabel, MAGIC_VNODE);
< COUNTER_INC(vnode_setlabel_extattr);
---
> COUNTER_INC(kenv_check_dump);
807,810c624,626
< COUNTER_DECL(devfs_update);
< static void
< test_devfs_update(struct mount *mp, struct devfs_dirent *devfs_dirent,
< struct label *direntlabel, struct vnode *vp, struct label *vplabel)
---
> COUNTER_DECL(kenv_check_get);
> static int
> test_kenv_check_get(struct ucred *cred, char *name)
813,816c629,630
< LABEL_CHECK(direntlabel, MAGIC_DEVFS);
< LABEL_CHECK(vplabel, MAGIC_VNODE);
< COUNTER_INC(devfs_update);
< }
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> COUNTER_INC(kenv_check_get);
818,829c632
< /*
< * Labeling event operations: IPC object.
< */
< COUNTER_DECL(socket_create_mbuf);
< static void
< test_socket_create_mbuf(struct socket *so, struct label *socketlabel,
< struct mbuf *m, struct label *mbuflabel)
< {
<
< LABEL_CHECK(socketlabel, MAGIC_SOCKET);
< LABEL_CHECK(mbuflabel, MAGIC_MBUF);
< COUNTER_INC(socket_create_mbuf);
---
> return (0);
832,835c635,637
< COUNTER_DECL(socket_create);
< static void
< test_socket_create(struct ucred *cred, struct socket *socket,
< struct label *socketlabel)
---
> COUNTER_DECL(kenv_check_set);
> static int
> test_kenv_check_set(struct ucred *cred, char *name, char *value)
839,841c641
< LABEL_CHECK(socketlabel, MAGIC_SOCKET);
< COUNTER_INC(socket_create);
< }
---
> COUNTER_INC(kenv_check_set);
843,851c643
< COUNTER_DECL(pipe_create);
< static void
< test_pipe_create(struct ucred *cred, struct pipepair *pp,
< struct label *pipelabel)
< {
<
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(pipelabel, MAGIC_PIPE);
< COUNTER_INC(pipe_create);
---
> return (0);
854,857c646,648
< COUNTER_DECL(posixsem_create);
< static void
< test_posixsem_create(struct ucred *cred, struct ksem *ks,
< struct label *kslabel)
---
> COUNTER_DECL(kenv_check_unset);
> static int
> test_kenv_check_unset(struct ucred *cred, char *name)
861,863c652
< LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
< COUNTER_INC(posixsem_create);
< }
---
> COUNTER_INC(kenv_check_unset);
865,874c654
< COUNTER_DECL(socket_newconn);
< static void
< test_socket_newconn(struct socket *oldsocket,
< struct label *oldsocketlabel, struct socket *newsocket,
< struct label *newsocketlabel)
< {
<
< LABEL_CHECK(oldsocketlabel, MAGIC_SOCKET);
< LABEL_CHECK(newsocketlabel, MAGIC_SOCKET);
< COUNTER_INC(socket_newconn);
---
> return (0);
877,880c657,660
< COUNTER_DECL(socket_relabel);
< static void
< test_socket_relabel(struct ucred *cred, struct socket *socket,
< struct label *socketlabel, struct label *newlabel)
---
> COUNTER_DECL(kld_check_load);
> static int
> test_kld_check_load(struct ucred *cred, struct vnode *vp,
> struct label *label)
884,886c664,665
< LABEL_CHECK(newlabel, MAGIC_SOCKET);
< COUNTER_INC(socket_relabel);
< }
---
> LABEL_CHECK(label, MAGIC_VNODE);
> COUNTER_INC(kld_check_load);
888,897c667
< COUNTER_DECL(pipe_relabel);
< static void
< test_pipe_relabel(struct ucred *cred, struct pipepair *pp,
< struct label *pipelabel, struct label *newlabel)
< {
<
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(pipelabel, MAGIC_PIPE);
< LABEL_CHECK(newlabel, MAGIC_PIPE);
< COUNTER_INC(pipe_relabel);
---
> return (0);
900,903c670,672
< COUNTER_DECL(socketpeer_set_from_mbuf);
< static void
< test_socketpeer_set_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel,
< struct socket *socket, struct label *socketpeerlabel)
---
> COUNTER_DECL(kld_check_stat);
> static int
> test_kld_check_stat(struct ucred *cred)
906,931d674
< LABEL_CHECK(mbuflabel, MAGIC_MBUF);
< LABEL_CHECK(socketpeerlabel, MAGIC_SOCKET);
< COUNTER_INC(socketpeer_set_from_mbuf);
< }
<
< /*
< * Labeling event operations: network objects.
< */
< COUNTER_DECL(socketpeer_set_from_socket);
< static void
< test_socketpeer_set_from_socket(struct socket *oldsocket,
< struct label *oldsocketlabel, struct socket *newsocket,
< struct label *newsocketpeerlabel)
< {
<
< LABEL_CHECK(oldsocketlabel, MAGIC_SOCKET);
< LABEL_CHECK(newsocketpeerlabel, MAGIC_SOCKET);
< COUNTER_INC(socketpeer_set_from_socket);
< }
<
< COUNTER_DECL(bpfdesc_create);
< static void
< test_bpfdesc_create(struct ucred *cred, struct bpf_d *bpf_d,
< struct label *bpflabel)
< {
<
933,935c676
< LABEL_CHECK(bpflabel, MAGIC_BPF);
< COUNTER_INC(bpfdesc_create);
< }
---
> COUNTER_INC(kld_check_stat);
937,945c678
< COUNTER_DECL(ipq_reassemble);
< static void
< test_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel,
< struct mbuf *datagram, struct label *datagramlabel)
< {
<
< LABEL_CHECK(ipqlabel, MAGIC_IPQ);
< LABEL_CHECK(datagramlabel, MAGIC_MBUF);
< COUNTER_INC(ipq_reassemble);
---
> return (0);
948c681
< COUNTER_DECL(netinet_fragment);
---
> COUNTER_DECL(mbuf_copy_label);
950,951c683
< test_netinet_fragment(struct mbuf *datagram, struct label *datagramlabel,
< struct mbuf *fragment, struct label *fragmentlabel)
---
> test_mbuf_copy_label(struct label *src, struct label *dest)
954,956c686,688
< LABEL_CHECK(datagramlabel, MAGIC_MBUF);
< LABEL_CHECK(fragmentlabel, MAGIC_MBUF);
< COUNTER_INC(netinet_fragment);
---
> LABEL_CHECK(src, MAGIC_MBUF);
> LABEL_CHECK(dest, MAGIC_MBUF);
> COUNTER_INC(mbuf_copy_label);
959c691
< COUNTER_DECL(ifnet_create);
---
> COUNTER_DECL(mbuf_destroy_label);
961c693
< test_ifnet_create(struct ifnet *ifp, struct label *ifplabel)
---
> test_mbuf_destroy_label(struct label *label)
964,966c696,702
< LABEL_CHECK(ifplabel, MAGIC_IFNET);
< COUNTER_INC(ifnet_create);
< }
---
> /*
> * If we're loaded dynamically, there may be mbufs in flight that
> * didn't have label storage allocated for them. Handle this
> * gracefully.
> */
> if (label == NULL)
> return;
968,976c704,705
< COUNTER_DECL(inpcb_create);
< static void
< test_inpcb_create(struct socket *so, struct label *solabel,
< struct inpcb *inp, struct label *inplabel)
< {
<
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< LABEL_CHECK(inplabel, MAGIC_INPCB);
< COUNTER_INC(inpcb_create);
---
> LABEL_DESTROY(label, MAGIC_MBUF);
> COUNTER_INC(mbuf_destroy_label);
979,981c708,710
< COUNTER_DECL(syncache_create);
< static void
< test_syncache_create(struct label *label, struct inpcb *inp)
---
> COUNTER_DECL(mbuf_init_label);
> static int
> test_mbuf_init_label(struct label *label, int flag)
984,986c713,716
< LABEL_CHECK(label, MAGIC_SYNCACHE);
< COUNTER_INC(syncache_create);
< }
---
> if (flag & M_WAITOK)
> WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
> "test_mbuf_init_label() at %s:%d", __FILE__,
> __LINE__);
988,996c718,720
< COUNTER_DECL(syncache_create_mbuf);
< static void
< test_syncache_create_mbuf(struct label *sc_label, struct mbuf *m,
< struct label *mlabel)
< {
<
< LABEL_CHECK(sc_label, MAGIC_SYNCACHE);
< LABEL_CHECK(mlabel, MAGIC_MBUF);
< COUNTER_INC(syncache_create_mbuf);
---
> LABEL_INIT(label, MAGIC_MBUF);
> COUNTER_INC(mbuf_init_label);
> return (0);
999,1002c723,726
< COUNTER_DECL(sysvmsg_create);
< static void
< test_sysvmsg_create(struct ucred *cred, struct msqid_kernel *msqkptr,
< struct label *msqlabel, struct msg *msgptr, struct label *msglabel)
---
> COUNTER_DECL(mount_check_stat);
> static int
> test_mount_check_stat(struct ucred *cred, struct mount *mp,
> struct label *mplabel)
1005,1008c729,731
< LABEL_CHECK(msglabel, MAGIC_SYSV_MSG);
< LABEL_CHECK(msqlabel, MAGIC_SYSV_MSQ);
< COUNTER_INC(sysvmsg_create);
< }
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(mplabel, MAGIC_MOUNT);
> COUNTER_INC(mount_check_stat);
1010,1017c733
< COUNTER_DECL(sysvmsq_create);
< static void
< test_sysvmsq_create(struct ucred *cred,
< struct msqid_kernel *msqkptr, struct label *msqlabel)
< {
<
< LABEL_CHECK(msqlabel, MAGIC_SYSV_MSQ);
< COUNTER_INC(sysvmsq_create);
---
> return (0);
1020c736
< COUNTER_DECL(sysvsem_create);
---
> COUNTER_DECL(mount_create);
1022,1023c738,739
< test_sysvsem_create(struct ucred *cred, struct semid_kernel *semakptr,
< struct label *semalabel)
---
> test_mount_create(struct ucred *cred, struct mount *mp,
> struct label *mplabel)
1026,1027c742,744
< LABEL_CHECK(semalabel, MAGIC_SYSV_SEM);
< COUNTER_INC(sysvsem_create);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(mplabel, MAGIC_MOUNT);
> COUNTER_INC(mount_create);
1030c747
< COUNTER_DECL(sysvshm_create);
---
> COUNTER_DECL(mount_destroy_label);
1032,1033c749
< test_sysvshm_create(struct ucred *cred, struct shmid_kernel *shmsegptr,
< struct label *shmlabel)
---
> test_mount_destroy_label(struct label *label)
1036,1037c752,753
< LABEL_CHECK(shmlabel, MAGIC_SYSV_SHM);
< COUNTER_INC(sysvshm_create);
---
> LABEL_DESTROY(label, MAGIC_MOUNT);
> COUNTER_INC(mount_destroy_label);
1040c756
< COUNTER_DECL(ipq_create);
---
> COUNTER_DECL(mount_init_label);
1042,1043c758
< test_ipq_create(struct mbuf *fragment, struct label *fragmentlabel,
< struct ipq *ipq, struct label *ipqlabel)
---
> test_mount_init_label(struct label *label)
1046,1048c761,762
< LABEL_CHECK(fragmentlabel, MAGIC_MBUF);
< LABEL_CHECK(ipqlabel, MAGIC_IPQ);
< COUNTER_INC(ipq_create);
---
> LABEL_INIT(label, MAGIC_MOUNT);
> COUNTER_INC(mount_init_label);
1051,1096d764
< COUNTER_DECL(inpcb_create_mbuf);
< static void
< test_inpcb_create_mbuf(struct inpcb *inp, struct label *inplabel,
< struct mbuf *m, struct label *mlabel)
< {
<
< LABEL_CHECK(inplabel, MAGIC_INPCB);
< LABEL_CHECK(mlabel, MAGIC_MBUF);
< COUNTER_INC(inpcb_create_mbuf);
< }
<
< COUNTER_DECL(bpfdesc_create_mbuf);
< static void
< test_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct label *bpflabel,
< struct mbuf *mbuf, struct label *mbuflabel)
< {
<
< LABEL_CHECK(bpflabel, MAGIC_BPF);
< LABEL_CHECK(mbuflabel, MAGIC_MBUF);
< COUNTER_INC(bpfdesc_create_mbuf);
< }
<
< COUNTER_DECL(ifnet_create_mbuf);
< static void
< test_ifnet_create_mbuf(struct ifnet *ifp, struct label *ifplabel,
< struct mbuf *m, struct label *mbuflabel)
< {
<
< LABEL_CHECK(ifplabel, MAGIC_IFNET);
< LABEL_CHECK(mbuflabel, MAGIC_MBUF);
< COUNTER_INC(ifnet_create_mbuf);
< }
<
< COUNTER_DECL(ipq_match);
< static int
< test_ipq_match(struct mbuf *fragment, struct label *fragmentlabel,
< struct ipq *ipq, struct label *ipqlabel)
< {
<
< LABEL_CHECK(fragmentlabel, MAGIC_MBUF);
< LABEL_CHECK(ipqlabel, MAGIC_IPQ);
< COUNTER_INC(ipq_match);
<
< return (1);
< }
<
1118a787,797
> COUNTER_DECL(netinet_fragment);
> static void
> test_netinet_fragment(struct mbuf *datagram, struct label *datagramlabel,
> struct mbuf *fragment, struct label *fragmentlabel)
> {
>
> LABEL_CHECK(datagramlabel, MAGIC_MBUF);
> LABEL_CHECK(fragmentlabel, MAGIC_MBUF);
> COUNTER_INC(netinet_fragment);
> }
>
1170,1173c849,852
< COUNTER_DECL(ifnet_relabel);
< static void
< test_ifnet_relabel(struct ucred *cred, struct ifnet *ifp,
< struct label *ifplabel, struct label *newlabel)
---
> COUNTER_DECL(pipe_check_ioctl);
> static int
> test_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp,
> struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data)
1177,1180c856,857
< LABEL_CHECK(ifplabel, MAGIC_IFNET);
< LABEL_CHECK(newlabel, MAGIC_IFNET);
< COUNTER_INC(ifnet_relabel);
< }
---
> LABEL_CHECK(pipelabel, MAGIC_PIPE);
> COUNTER_INC(pipe_check_ioctl);
1182,1190c859
< COUNTER_DECL(ipq_update);
< static void
< test_ipq_update(struct mbuf *fragment, struct label *fragmentlabel,
< struct ipq *ipq, struct label *ipqlabel)
< {
<
< LABEL_CHECK(fragmentlabel, MAGIC_MBUF);
< LABEL_CHECK(ipqlabel, MAGIC_IPQ);
< COUNTER_INC(ipq_update);
---
> return (0);
1193,1196c862,865
< COUNTER_DECL(inpcb_sosetlabel);
< static void
< test_inpcb_sosetlabel(struct socket *so, struct label *solabel,
< struct inpcb *inp, struct label *inplabel)
---
> COUNTER_DECL(pipe_check_poll);
> static int
> test_pipe_check_poll(struct ucred *cred, struct pipepair *pp,
> struct label *pipelabel)
1199,1201c868,872
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< LABEL_CHECK(inplabel, MAGIC_INPCB);
< COUNTER_INC(inpcb_sosetlabel);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(pipelabel, MAGIC_PIPE);
> COUNTER_INC(pipe_check_poll);
>
> return (0);
1204,1212c875,878
< /*
< * Labeling event operations: processes.
< */
< COUNTER_DECL(vnode_execve_transition);
< static void
< test_vnode_execve_transition(struct ucred *old, struct ucred *new,
< struct vnode *vp, struct label *filelabel,
< struct label *interpvplabel, struct image_params *imgp,
< struct label *execlabel)
---
> COUNTER_DECL(pipe_check_read);
> static int
> test_pipe_check_read(struct ucred *cred, struct pipepair *pp,
> struct label *pipelabel)
1215,1220c881,885
< LABEL_CHECK(old->cr_label, MAGIC_CRED);
< LABEL_CHECK(new->cr_label, MAGIC_CRED);
< LABEL_CHECK(filelabel, MAGIC_VNODE);
< LABEL_CHECK(interpvplabel, MAGIC_VNODE);
< LABEL_CHECK(execlabel, MAGIC_CRED);
< COUNTER_INC(vnode_execve_transition);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(pipelabel, MAGIC_PIPE);
> COUNTER_INC(pipe_check_read);
>
> return (0);
1223c888
< COUNTER_DECL(vnode_execve_will_transition);
---
> COUNTER_DECL(pipe_check_relabel);
1225,1227c890,891
< test_vnode_execve_will_transition(struct ucred *old, struct vnode *vp,
< struct label *filelabel, struct label *interpvplabel,
< struct image_params *imgp, struct label *execlabel)
---
> test_pipe_check_relabel(struct ucred *cred, struct pipepair *pp,
> struct label *pipelabel, struct label *newlabel)
1230,1234c894,897
< LABEL_CHECK(old->cr_label, MAGIC_CRED);
< LABEL_CHECK(filelabel, MAGIC_VNODE);
< LABEL_CHECK(interpvplabel, MAGIC_VNODE);
< LABEL_CHECK(execlabel, MAGIC_CRED);
< COUNTER_INC(vnode_execve_will_transition);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(pipelabel, MAGIC_PIPE);
> LABEL_CHECK(newlabel, MAGIC_PIPE);
> COUNTER_INC(pipe_check_relabel);
1239,1241c902,905
< COUNTER_DECL(proc_create_swapper);
< static void
< test_proc_create_swapper(struct ucred *cred)
---
> COUNTER_DECL(pipe_check_stat);
> static int
> test_pipe_check_stat(struct ucred *cred, struct pipepair *pp,
> struct label *pipelabel)
1245c909,912
< COUNTER_INC(proc_create_swapper);
---
> LABEL_CHECK(pipelabel, MAGIC_PIPE);
> COUNTER_INC(pipe_check_stat);
>
> return (0);
1248,1250c915,918
< COUNTER_DECL(proc_create_init);
< static void
< test_proc_create_init(struct ucred *cred)
---
> COUNTER_DECL(pipe_check_write);
> static int
> test_pipe_check_write(struct ucred *cred, struct pipepair *pp,
> struct label *pipelabel)
1254c922,925
< COUNTER_INC(proc_create_init);
---
> LABEL_CHECK(pipelabel, MAGIC_PIPE);
> COUNTER_INC(pipe_check_write);
>
> return (0);
1257c928
< COUNTER_DECL(cred_relabel);
---
> COUNTER_DECL(pipe_copy_label);
1259c930
< test_cred_relabel(struct ucred *cred, struct label *newlabel)
---
> test_pipe_copy_label(struct label *src, struct label *dest)
1262,1264c933,935
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(newlabel, MAGIC_CRED);
< COUNTER_INC(cred_relabel);
---
> LABEL_CHECK(src, MAGIC_PIPE);
> LABEL_CHECK(dest, MAGIC_PIPE);
> COUNTER_INC(pipe_copy_label);
1267c938
< COUNTER_DECL(thread_userret);
---
> COUNTER_DECL(pipe_create);
1269c940,941
< test_thread_userret(struct thread *td)
---
> test_pipe_create(struct ucred *cred, struct pipepair *pp,
> struct label *pipelabel)
1272c944,946
< COUNTER_INC(thread_userret);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(pipelabel, MAGIC_PIPE);
> COUNTER_INC(pipe_create);
1275,1278c949
< /*
< * Label cleanup/flush operations
< */
< COUNTER_DECL(sysvmsg_cleanup);
---
> COUNTER_DECL(pipe_destroy_label);
1280c951
< test_sysvmsg_cleanup(struct label *msglabel)
---
> test_pipe_destroy_label(struct label *label)
1283,1284c954,955
< LABEL_CHECK(msglabel, MAGIC_SYSV_MSG);
< COUNTER_INC(sysvmsg_cleanup);
---
> LABEL_DESTROY(label, MAGIC_PIPE);
> COUNTER_INC(pipe_destroy_label);
1287,1289c958,961
< COUNTER_DECL(sysvmsq_cleanup);
< static void
< test_sysvmsq_cleanup(struct label *msqlabel)
---
> COUNTER_DECL(pipe_externalize_label);
> static int
> test_pipe_externalize_label(struct label *label, char *element_name,
> struct sbuf *sb, int *claimed)
1292,1293c964,967
< LABEL_CHECK(msqlabel, MAGIC_SYSV_MSQ);
< COUNTER_INC(sysvmsq_cleanup);
---
> LABEL_CHECK(label, MAGIC_PIPE);
> COUNTER_INC(pipe_externalize_label);
>
> return (0);
1296c970
< COUNTER_DECL(sysvsem_cleanup);
---
> COUNTER_DECL(pipe_init_label);
1298c972
< test_sysvsem_cleanup(struct label *semalabel)
---
> test_pipe_init_label(struct label *label)
1301,1302c975,976
< LABEL_CHECK(semalabel, MAGIC_SYSV_SEM);
< COUNTER_INC(sysvsem_cleanup);
---
> LABEL_INIT(label, MAGIC_PIPE);
> COUNTER_INC(pipe_init_label);
1305c979
< COUNTER_DECL(sysvshm_cleanup);
---
> COUNTER_DECL(pipe_relabel);
1307c981,982
< test_sysvshm_cleanup(struct label *shmlabel)
---
> test_pipe_relabel(struct ucred *cred, struct pipepair *pp,
> struct label *pipelabel, struct label *newlabel)
1310,1311c985,988
< LABEL_CHECK(shmlabel, MAGIC_SYSV_SHM);
< COUNTER_INC(sysvshm_cleanup);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(pipelabel, MAGIC_PIPE);
> LABEL_CHECK(newlabel, MAGIC_PIPE);
> COUNTER_INC(pipe_relabel);
1314,1317c991
< /*
< * Access control checks.
< */
< COUNTER_DECL(bpfdesc_check_receive);
---
> COUNTER_DECL(posixsem_check_destroy);
1319,1320c993,994
< test_bpfdesc_check_receive(struct bpf_d *bpf_d, struct label *bpflabel,
< struct ifnet *ifp, struct label *ifplabel)
---
> test_posixsem_check_destroy(struct ucred *cred, struct ksem *ks,
> struct label *kslabel)
1323,1325c997,999
< LABEL_CHECK(bpflabel, MAGIC_BPF);
< LABEL_CHECK(ifplabel, MAGIC_IFNET);
< COUNTER_INC(bpfdesc_check_receive);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
> COUNTER_INC(posixsem_check_destroy);
1330c1004
< COUNTER_DECL(cred_check_relabel);
---
> COUNTER_DECL(posixsem_check_getvalue);
1332c1006,1007
< test_cred_check_relabel(struct ucred *cred, struct label *newlabel)
---
> test_posixsem_check_getvalue(struct ucred *cred, struct ksem *ks,
> struct label *kslabel)
1336,1337c1011,1012
< LABEL_CHECK(newlabel, MAGIC_CRED);
< COUNTER_INC(cred_check_relabel);
---
> LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
> COUNTER_INC(posixsem_check_getvalue);
1342c1017
< COUNTER_DECL(cred_check_visible);
---
> COUNTER_DECL(posixsem_check_open);
1344c1019,1020
< test_cred_check_visible(struct ucred *u1, struct ucred *u2)
---
> test_posixsem_check_open(struct ucred *cred, struct ksem *ks,
> struct label *kslabel)
1347,1349c1023,1025
< LABEL_CHECK(u1->cr_label, MAGIC_CRED);
< LABEL_CHECK(u2->cr_label, MAGIC_CRED);
< COUNTER_INC(cred_check_visible);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
> COUNTER_INC(posixsem_check_open);
1354c1030
< COUNTER_DECL(ifnet_check_relabel);
---
> COUNTER_DECL(posixsem_check_post);
1356,1357c1032,1033
< test_ifnet_check_relabel(struct ucred *cred, struct ifnet *ifp,
< struct label *ifplabel, struct label *newlabel)
---
> test_posixsem_check_post(struct ucred *cred, struct ksem *ks,
> struct label *kslabel)
1361,1363c1037,1038
< LABEL_CHECK(ifplabel, MAGIC_IFNET);
< LABEL_CHECK(newlabel, MAGIC_IFNET);
< COUNTER_INC(ifnet_check_relabel);
---
> LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
> COUNTER_INC(posixsem_check_post);
1368c1043
< COUNTER_DECL(ifnet_check_transmit);
---
> COUNTER_DECL(posixsem_check_unlink);
1370,1371c1045,1046
< test_ifnet_check_transmit(struct ifnet *ifp, struct label *ifplabel,
< struct mbuf *m, struct label *mbuflabel)
---
> test_posixsem_check_unlink(struct ucred *cred, struct ksem *ks,
> struct label *kslabel)
1374,1376c1049,1051
< LABEL_CHECK(ifplabel, MAGIC_IFNET);
< LABEL_CHECK(mbuflabel, MAGIC_MBUF);
< COUNTER_INC(ifnet_check_transmit);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
> COUNTER_INC(posixsem_check_unlink);
1381c1056
< COUNTER_DECL(inpcb_check_deliver);
---
> COUNTER_DECL(posixsem_check_wait);
1383,1384c1058,1059
< test_inpcb_check_deliver(struct inpcb *inp, struct label *inplabel,
< struct mbuf *m, struct label *mlabel)
---
> test_posixsem_check_wait(struct ucred *cred, struct ksem *ks,
> struct label *kslabel)
1387,1389c1062,1064
< LABEL_CHECK(inplabel, MAGIC_INPCB);
< LABEL_CHECK(mlabel, MAGIC_MBUF);
< COUNTER_INC(inpcb_check_deliver);
---
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
> COUNTER_INC(posixsem_check_wait);
1394,1398c1069,1072
< COUNTER_DECL(sysvmsq_check_msgmsq);
< static int
< test_sysvmsq_check_msgmsq(struct ucred *cred, struct msg *msgptr,
< struct label *msglabel, struct msqid_kernel *msqkptr,
< struct label *msqklabel)
---
> COUNTER_DECL(posixsem_create);
> static void
> test_posixsem_create(struct ucred *cred, struct ksem *ks,
> struct label *kslabel)
1401,1402d1074
< LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ);
< LABEL_CHECK(msglabel, MAGIC_SYSV_MSG);
1404c1076,1078
< COUNTER_INC(sysvmsq_check_msgmsq);
---
> LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
> COUNTER_INC(posixsem_create);
> }
1406c1080,1086
< return (0);
---
> COUNTER_DECL(posixsem_destroy_label);
> static void
> test_posixsem_destroy_label(struct label *label)
> {
>
> LABEL_DESTROY(label, MAGIC_POSIX_SEM);
> COUNTER_INC(posixsem_destroy_label);
1409c1089,1098
< COUNTER_DECL(sysvmsq_check_msgrcv);
---
> COUNTER_DECL(posixsem_init_label);
> static void
> test_posixsem_init_label(struct label *label)
> {
>
> LABEL_INIT(label, MAGIC_POSIX_SEM);
> COUNTER_INC(posixsem_init_label);
> }
>
> COUNTER_DECL(proc_check_debug);
1411,1412c1100
< test_sysvmsq_check_msgrcv(struct ucred *cred, struct msg *msgptr,
< struct label *msglabel)
---
> test_proc_check_debug(struct ucred *cred, struct proc *p)
1415d1102
< LABEL_CHECK(msglabel, MAGIC_SYSV_MSG);
1417c1104,1105
< COUNTER_INC(sysvmsq_check_msgrcv);
---
> LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED);
> COUNTER_INC(proc_check_debug);
1422c1110
< COUNTER_DECL(sysvmsq_check_msgrmid);
---
> COUNTER_DECL(proc_check_sched);
1424,1425c1112
< test_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr,
< struct label *msglabel)
---
> test_proc_check_sched(struct ucred *cred, struct proc *p)
1428d1114
< LABEL_CHECK(msglabel, MAGIC_SYSV_MSG);
1430c1116,1117
< COUNTER_INC(sysvmsq_check_msgrmid);
---
> LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED);
> COUNTER_INC(proc_check_sched);
1435c1122
< COUNTER_DECL(sysvmsq_check_msqget);
---
> COUNTER_DECL(proc_check_signal);
1437,1438c1124
< test_sysvmsq_check_msqget(struct ucred *cred,
< struct msqid_kernel *msqkptr, struct label *msqklabel)
---
> test_proc_check_signal(struct ucred *cred, struct proc *p, int signum)
1441d1126
< LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ);
1443c1128,1129
< COUNTER_INC(sysvmsq_check_msqget);
---
> LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED);
> COUNTER_INC(proc_check_signal);
1448c1134
< COUNTER_DECL(sysvmsq_check_msqsnd);
---
> COUNTER_DECL(proc_check_setaudit);
1450,1451c1136
< test_sysvmsq_check_msqsnd(struct ucred *cred,
< struct msqid_kernel *msqkptr, struct label *msqklabel)
---
> test_proc_check_setaudit(struct ucred *cred, struct auditinfo *ai)
1454d1138
< LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ);
1456c1140
< COUNTER_INC(sysvmsq_check_msqsnd);
---
> COUNTER_INC(proc_check_setaudit);
1461c1145
< COUNTER_DECL(sysvmsq_check_msqrcv);
---
> COUNTER_DECL(proc_check_setaudit_addr);
1463,1464c1147,1148
< test_sysvmsq_check_msqrcv(struct ucred *cred,
< struct msqid_kernel *msqkptr, struct label *msqklabel)
---
> test_proc_check_setaudit_addr(struct ucred *cred,
> struct auditinfo_addr *aia)
1467d1150
< LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ);
1469c1152
< COUNTER_INC(sysvmsq_check_msqrcv);
---
> COUNTER_INC(proc_check_setaudit_addr);
1474c1157
< COUNTER_DECL(sysvmsq_check_msqctl);
---
> COUNTER_DECL(proc_check_setauid);
1476,1477c1159
< test_sysvmsq_check_msqctl(struct ucred *cred,
< struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd)
---
> test_proc_check_setauid(struct ucred *cred, uid_t auid)
1480d1161
< LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ);
1482c1163
< COUNTER_INC(sysvmsq_check_msqctl);
---
> COUNTER_INC(proc_check_setauid);
1487c1168
< COUNTER_DECL(sysvsem_check_semctl);
---
> COUNTER_DECL(proc_check_setegid);
1489,1490c1170
< test_sysvsem_check_semctl(struct ucred *cred,
< struct semid_kernel *semakptr, struct label *semaklabel, int cmd)
---
> test_proc_check_setegid(struct ucred *cred, gid_t egid)
1494,1495c1174
< LABEL_CHECK(semaklabel, MAGIC_SYSV_SEM);
< COUNTER_INC(sysvsem_check_semctl);
---
> COUNTER_INC(proc_check_setegid);
1497c1176
< return (0);
---
> return (0);
1500c1179
< COUNTER_DECL(sysvsem_check_semget);
---
> COUNTER_DECL(proc_check_euid);
1502,1503c1181
< test_sysvsem_check_semget(struct ucred *cred,
< struct semid_kernel *semakptr, struct label *semaklabel)
---
> test_proc_check_seteuid(struct ucred *cred, uid_t euid)
1507,1508c1185
< LABEL_CHECK(semaklabel, MAGIC_SYSV_SEM);
< COUNTER_INC(sysvsem_check_semget);
---
> COUNTER_INC(proc_check_euid);
1513c1190
< COUNTER_DECL(sysvsem_check_semop);
---
> COUNTER_DECL(proc_check_setregid);
1515,1516c1192
< test_sysvsem_check_semop(struct ucred *cred,
< struct semid_kernel *semakptr, struct label *semaklabel, size_t accesstype)
---
> test_proc_check_setregid(struct ucred *cred, gid_t rgid, gid_t egid)
1520,1521c1196
< LABEL_CHECK(semaklabel, MAGIC_SYSV_SEM);
< COUNTER_INC(sysvsem_check_semop);
---
> COUNTER_INC(proc_check_setregid);
1526c1201
< COUNTER_DECL(sysvshm_check_shmat);
---
> COUNTER_DECL(proc_check_setreuid);
1528,1529c1203
< test_sysvshm_check_shmat(struct ucred *cred,
< struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg)
---
> test_proc_check_setreuid(struct ucred *cred, uid_t ruid, uid_t euid)
1533,1534c1207
< LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM);
< COUNTER_INC(sysvshm_check_shmat);
---
> COUNTER_INC(proc_check_setreuid);
1536c1209
< return (0);
---
> return (0);
1539c1212
< COUNTER_DECL(sysvshm_check_shmctl);
---
> COUNTER_DECL(proc_check_setgid);
1541,1542c1214
< test_sysvshm_check_shmctl(struct ucred *cred,
< struct shmid_kernel *shmsegptr, struct label *shmseglabel, int cmd)
---
> test_proc_check_setgid(struct ucred *cred, gid_t gid)
1546,1547c1218
< LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM);
< COUNTER_INC(sysvshm_check_shmctl);
---
> COUNTER_INC(proc_check_setgid);
1549c1220
< return (0);
---
> return (0);
1552c1223
< COUNTER_DECL(sysvshm_check_shmdt);
---
> COUNTER_DECL(proc_check_setgroups);
1554,1555c1225,1226
< test_sysvshm_check_shmdt(struct ucred *cred,
< struct shmid_kernel *shmsegptr, struct label *shmseglabel)
---
> test_proc_check_setgroups(struct ucred *cred, int ngroups,
> gid_t *gidset)
1559,1560c1230
< LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM);
< COUNTER_INC(sysvshm_check_shmdt);
---
> COUNTER_INC(proc_check_setgroups);
1565c1235
< COUNTER_DECL(sysvshm_check_shmget);
---
> COUNTER_DECL(proc_check_setresgid);
1567,1568c1237,1238
< test_sysvshm_check_shmget(struct ucred *cred,
< struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg)
---
> test_proc_check_setresgid(struct ucred *cred, gid_t rgid, gid_t egid,
> gid_t sgid)
1572,1573c1242
< LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM);
< COUNTER_INC(sysvshm_check_shmget);
---
> COUNTER_INC(proc_check_setresgid);
1578c1247
< COUNTER_DECL(kenv_check_dump);
---
> COUNTER_DECL(proc_check_setresuid);
1580c1249,1250
< test_kenv_check_dump(struct ucred *cred)
---
> test_proc_check_setresuid(struct ucred *cred, uid_t ruid, uid_t euid,
> uid_t suid)
1584c1254
< COUNTER_INC(kenv_check_dump);
---
> COUNTER_INC(proc_check_setresuid);
1589c1259
< COUNTER_DECL(kenv_check_get);
---
> COUNTER_DECL(proc_check_setuid);
1591c1261
< test_kenv_check_get(struct ucred *cred, char *name)
---
> test_proc_check_setuid(struct ucred *cred, uid_t uid)
1595c1265
< COUNTER_INC(kenv_check_get);
---
> COUNTER_INC(proc_check_setuid);
1600c1270
< COUNTER_DECL(kenv_check_set);
---
> COUNTER_DECL(proc_check_wait);
1602c1272
< test_kenv_check_set(struct ucred *cred, char *name, char *value)
---
> test_proc_check_wait(struct ucred *cred, struct proc *p)
1606c1276,1277
< COUNTER_INC(kenv_check_set);
---
> LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED);
> COUNTER_INC(proc_check_wait);
1611,1613c1282,1284
< COUNTER_DECL(kenv_check_unset);
< static int
< test_kenv_check_unset(struct ucred *cred, char *name)
---
> COUNTER_DECL(proc_create_init);
> static void
> test_proc_create_init(struct ucred *cred)
1617,1619c1288
< COUNTER_INC(kenv_check_unset);
<
< return (0);
---
> COUNTER_INC(proc_create_init);
1622,1625c1291,1293
< COUNTER_DECL(kld_check_load);
< static int
< test_kld_check_load(struct ucred *cred, struct vnode *vp,
< struct label *label)
---
> COUNTER_DECL(proc_create_swapper);
> static void
> test_proc_create_swapper(struct ucred *cred)
1629,1630c1297,1298
< LABEL_CHECK(label, MAGIC_VNODE);
< COUNTER_INC(kld_check_load);
---
> COUNTER_INC(proc_create_swapper);
> }
1632c1300,1306
< return (0);
---
> COUNTER_DECL(proc_destroy_label);
> static void
> test_proc_destroy_label(struct label *label)
> {
>
> LABEL_DESTROY(label, MAGIC_PROC);
> COUNTER_INC(proc_destroy_label);
1635c1309,1318
< COUNTER_DECL(kld_check_stat);
---
> COUNTER_DECL(proc_init_label);
> static void
> test_proc_init_label(struct label *label)
> {
>
> LABEL_INIT(label, MAGIC_PROC);
> COUNTER_INC(proc_init_label);
> }
>
> COUNTER_DECL(socket_check_accept);
1637c1320,1321
< test_kld_check_stat(struct ucred *cred)
---
> test_socket_check_accept(struct ucred *cred, struct socket *so,
> struct label *solabel)
1641c1325,1326
< COUNTER_INC(kld_check_stat);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> COUNTER_INC(socket_check_accept);
1646c1331
< COUNTER_DECL(mount_check_stat);
---
> COUNTER_DECL(socket_check_bind);
1648,1649c1333,1334
< test_mount_check_stat(struct ucred *cred, struct mount *mp,
< struct label *mplabel)
---
> test_socket_check_bind(struct ucred *cred, struct socket *so,
> struct label *solabel, struct sockaddr *sa)
1653,1654c1338,1339
< LABEL_CHECK(mplabel, MAGIC_MOUNT);
< COUNTER_INC(mount_check_stat);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> COUNTER_INC(socket_check_bind);
1659c1344
< COUNTER_DECL(pipe_check_ioctl);
---
> COUNTER_DECL(socket_check_connect);
1661,1662c1346,1347
< test_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp,
< struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data)
---
> test_socket_check_connect(struct ucred *cred, struct socket *so,
> struct label *solabel, struct sockaddr *sa)
1666,1667c1351,1352
< LABEL_CHECK(pipelabel, MAGIC_PIPE);
< COUNTER_INC(pipe_check_ioctl);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> COUNTER_INC(socket_check_connect);
1672c1357
< COUNTER_DECL(pipe_check_poll);
---
> COUNTER_DECL(socket_check_deliver);
1674,1675c1359,1360
< test_pipe_check_poll(struct ucred *cred, struct pipepair *pp,
< struct label *pipelabel)
---
> test_socket_check_deliver(struct socket *so, struct label *solabel,
> struct mbuf *m, struct label *mlabel)
1678,1680c1363,1365
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(pipelabel, MAGIC_PIPE);
< COUNTER_INC(pipe_check_poll);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> LABEL_CHECK(mlabel, MAGIC_MBUF);
> COUNTER_INC(socket_check_deliver);
1685c1370
< COUNTER_DECL(pipe_check_read);
---
> COUNTER_DECL(socket_check_listen);
1687,1688c1372,1373
< test_pipe_check_read(struct ucred *cred, struct pipepair *pp,
< struct label *pipelabel)
---
> test_socket_check_listen(struct ucred *cred, struct socket *so,
> struct label *solabel)
1692,1693c1377,1378
< LABEL_CHECK(pipelabel, MAGIC_PIPE);
< COUNTER_INC(pipe_check_read);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> COUNTER_INC(socket_check_listen);
1698c1383
< COUNTER_DECL(pipe_check_relabel);
---
> COUNTER_DECL(socket_check_poll);
1700,1701c1385,1386
< test_pipe_check_relabel(struct ucred *cred, struct pipepair *pp,
< struct label *pipelabel, struct label *newlabel)
---
> test_socket_check_poll(struct ucred *cred, struct socket *so,
> struct label *solabel)
1705,1707c1390,1391
< LABEL_CHECK(pipelabel, MAGIC_PIPE);
< LABEL_CHECK(newlabel, MAGIC_PIPE);
< COUNTER_INC(pipe_check_relabel);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> COUNTER_INC(socket_check_poll);
1712c1396
< COUNTER_DECL(pipe_check_stat);
---
> COUNTER_DECL(socket_check_receive);
1714,1715c1398,1399
< test_pipe_check_stat(struct ucred *cred, struct pipepair *pp,
< struct label *pipelabel)
---
> test_socket_check_receive(struct ucred *cred, struct socket *so,
> struct label *solabel)
1719,1720c1403,1404
< LABEL_CHECK(pipelabel, MAGIC_PIPE);
< COUNTER_INC(pipe_check_stat);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> COUNTER_INC(socket_check_receive);
1725c1409
< COUNTER_DECL(pipe_check_write);
---
> COUNTER_DECL(socket_check_relabel);
1727,1728c1411,1412
< test_pipe_check_write(struct ucred *cred, struct pipepair *pp,
< struct label *pipelabel)
---
> test_socket_check_relabel(struct ucred *cred, struct socket *so,
> struct label *solabel, struct label *newlabel)
1732,1733c1416,1418
< LABEL_CHECK(pipelabel, MAGIC_PIPE);
< COUNTER_INC(pipe_check_write);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> LABEL_CHECK(newlabel, MAGIC_SOCKET);
> COUNTER_INC(socket_check_relabel);
1738c1423
< COUNTER_DECL(posixsem_check_destroy);
---
> COUNTER_DECL(socket_check_send);
1740,1741c1425,1426
< test_posixsem_check_destroy(struct ucred *cred, struct ksem *ks,
< struct label *kslabel)
---
> test_socket_check_send(struct ucred *cred, struct socket *so,
> struct label *solabel)
1745,1746c1430,1431
< LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
< COUNTER_INC(posixsem_check_destroy);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> COUNTER_INC(socket_check_send);
1751c1436
< COUNTER_DECL(posixsem_check_getvalue);
---
> COUNTER_DECL(socket_check_stat);
1753,1754c1438,1439
< test_posixsem_check_getvalue(struct ucred *cred, struct ksem *ks,
< struct label *kslabel)
---
> test_socket_check_stat(struct ucred *cred, struct socket *so,
> struct label *solabel)
1758,1759c1443,1444
< LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
< COUNTER_INC(posixsem_check_getvalue);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> COUNTER_INC(socket_check_stat);
1764c1449
< COUNTER_DECL(posixsem_check_open);
---
> COUNTER_DECL(socket_check_visible);
1766,1767c1451,1452
< test_posixsem_check_open(struct ucred *cred, struct ksem *ks,
< struct label *kslabel)
---
> test_socket_check_visible(struct ucred *cred, struct socket *so,
> struct label *solabel)
1771,1772c1456,1457
< LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
< COUNTER_INC(posixsem_check_open);
---
> LABEL_CHECK(solabel, MAGIC_SOCKET);
> COUNTER_INC(socket_check_visible);
1777,1780c1462,1464
< COUNTER_DECL(posixsem_check_post);
< static int
< test_posixsem_check_post(struct ucred *cred, struct ksem *ks,
< struct label *kslabel)
---
> COUNTER_DECL(socket_copy_label);
> static void
> test_socket_copy_label(struct label *src, struct label *dest)
1782a1467,1477
> LABEL_CHECK(src, MAGIC_SOCKET);
> LABEL_CHECK(dest, MAGIC_SOCKET);
> COUNTER_INC(socket_copy_label);
> }
>
> COUNTER_DECL(socket_create);
> static void
> test_socket_create(struct ucred *cred, struct socket *socket,
> struct label *socketlabel)
> {
>
1784,1785c1479,1481
< LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
< COUNTER_INC(posixsem_check_post);
---
> LABEL_CHECK(socketlabel, MAGIC_SOCKET);
> COUNTER_INC(socket_create);
> }
1787c1483,1491
< return (0);
---
> COUNTER_DECL(socket_create_mbuf);
> static void
> test_socket_create_mbuf(struct socket *so, struct label *socketlabel,
> struct mbuf *m, struct label *mbuflabel)
> {
>
> LABEL_CHECK(socketlabel, MAGIC_SOCKET);
> LABEL_CHECK(mbuflabel, MAGIC_MBUF);
> COUNTER_INC(socket_create_mbuf);
1790c1494,1503
< COUNTER_DECL(posixsem_check_unlink);
---
> COUNTER_DECL(socket_destroy_label);
> static void
> test_socket_destroy_label(struct label *label)
> {
>
> LABEL_DESTROY(label, MAGIC_SOCKET);
> COUNTER_INC(socket_destroy_label);
> }
>
> COUNTER_DECL(socket_externalize_label);
1792,1793c1505,1506
< test_posixsem_check_unlink(struct ucred *cred, struct ksem *ks,
< struct label *kslabel)
---
> test_socket_externalize_label(struct label *label, char *element_name,
> struct sbuf *sb, int *claimed)
1796,1798c1509,1510
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
< COUNTER_INC(posixsem_check_unlink);
---
> LABEL_CHECK(label, MAGIC_SOCKET);
> COUNTER_INC(socket_externalize_label);
1803c1515
< COUNTER_DECL(posixsem_check_wait);
---
> COUNTER_DECL(socket_init_label);
1805,1806c1517
< test_posixsem_check_wait(struct ucred *cred, struct ksem *ks,
< struct label *kslabel)
---
> test_socket_init_label(struct label *label, int flag)
1809,1811c1520,1523
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(kslabel, MAGIC_POSIX_SEM);
< COUNTER_INC(posixsem_check_wait);
---
> if (flag & M_WAITOK)
> WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
> "test_socket_init_label() at %s:%d", __FILE__,
> __LINE__);
1812a1525,1526
> LABEL_INIT(label, MAGIC_SOCKET);
> COUNTER_INC(socket_init_label);
1816,1818c1530,1534
< COUNTER_DECL(proc_check_debug);
< static int
< test_proc_check_debug(struct ucred *cred, struct proc *p)
---
> COUNTER_DECL(socket_newconn);
> static void
> test_socket_newconn(struct socket *oldsocket,
> struct label *oldsocketlabel, struct socket *newsocket,
> struct label *newsocketlabel)
1820a1537,1547
> LABEL_CHECK(oldsocketlabel, MAGIC_SOCKET);
> LABEL_CHECK(newsocketlabel, MAGIC_SOCKET);
> COUNTER_INC(socket_newconn);
> }
>
> COUNTER_DECL(socket_relabel);
> static void
> test_socket_relabel(struct ucred *cred, struct socket *socket,
> struct label *socketlabel, struct label *newlabel)
> {
>
1822,1823c1549,1551
< LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED);
< COUNTER_INC(proc_check_debug);
---
> LABEL_CHECK(newlabel, MAGIC_SOCKET);
> COUNTER_INC(socket_relabel);
> }
1825c1553,1559
< return (0);
---
> COUNTER_DECL(socketpeer_destroy_label);
> static void
> test_socketpeer_destroy_label(struct label *label)
> {
>
> LABEL_DESTROY(label, MAGIC_SOCKET);
> COUNTER_INC(socketpeer_destroy_label);
1828c1562
< COUNTER_DECL(proc_check_sched);
---
> COUNTER_DECL(socketpeer_externalize_label);
1830c1564,1565
< test_proc_check_sched(struct ucred *cred, struct proc *p)
---
> test_socketpeer_externalize_label(struct label *label, char *element_name,
> struct sbuf *sb, int *claimed)
1833,1835c1568,1569
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED);
< COUNTER_INC(proc_check_sched);
---
> LABEL_CHECK(label, MAGIC_SOCKET);
> COUNTER_INC(socketpeer_externalize_label);
1840c1574
< COUNTER_DECL(proc_check_signal);
---
> COUNTER_DECL(socketpeer_init_label);
1842c1576
< test_proc_check_signal(struct ucred *cred, struct proc *p, int signum)
---
> test_socketpeer_init_label(struct label *label, int flag)
1845,1847c1579,1582
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED);
< COUNTER_INC(proc_check_signal);
---
> if (flag & M_WAITOK)
> WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
> "test_socketpeer_init_label() at %s:%d", __FILE__,
> __LINE__);
1848a1584,1585
> LABEL_INIT(label, MAGIC_SOCKET);
> COUNTER_INC(socketpeer_init_label);
1852,1854c1589,1592
< COUNTER_DECL(proc_check_setaudit);
< static int
< test_proc_check_setaudit(struct ucred *cred, struct auditinfo *ai)
---
> COUNTER_DECL(socketpeer_set_from_mbuf);
> static void
> test_socketpeer_set_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel,
> struct socket *socket, struct label *socketpeerlabel)
1857,1858c1595,1598
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< COUNTER_INC(proc_check_setaudit);
---
> LABEL_CHECK(mbuflabel, MAGIC_MBUF);
> LABEL_CHECK(socketpeerlabel, MAGIC_SOCKET);
> COUNTER_INC(socketpeer_set_from_mbuf);
> }
1860c1600,1609
< return (0);
---
> COUNTER_DECL(socketpeer_set_from_socket);
> static void
> test_socketpeer_set_from_socket(struct socket *oldsocket,
> struct label *oldsocketlabel, struct socket *newsocket,
> struct label *newsocketpeerlabel)
> {
>
> LABEL_CHECK(oldsocketlabel, MAGIC_SOCKET);
> LABEL_CHECK(newsocketpeerlabel, MAGIC_SOCKET);
> COUNTER_INC(socketpeer_set_from_socket);
1863,1866c1612,1614
< COUNTER_DECL(proc_check_setaudit_addr);
< static int
< test_proc_check_setaudit_addr(struct ucred *cred,
< struct auditinfo_addr *aia)
---
> COUNTER_DECL(syncache_create);
> static void
> test_syncache_create(struct label *label, struct inpcb *inp)
1869,1870c1617,1619
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< COUNTER_INC(proc_check_setaudit_addr);
---
> LABEL_CHECK(label, MAGIC_SYNCACHE);
> COUNTER_INC(syncache_create);
> }
1872c1621,1629
< return (0);
---
> COUNTER_DECL(syncache_create_mbuf);
> static void
> test_syncache_create_mbuf(struct label *sc_label, struct mbuf *m,
> struct label *mlabel)
> {
>
> LABEL_CHECK(sc_label, MAGIC_SYNCACHE);
> LABEL_CHECK(mlabel, MAGIC_MBUF);
> COUNTER_INC(syncache_create_mbuf);
1875,1877c1632,1634
< COUNTER_DECL(proc_check_setauid);
< static int
< test_proc_check_setauid(struct ucred *cred, uid_t auid)
---
> COUNTER_DECL(syncache_destroy_label);
> static void
> test_syncache_destroy_label(struct label *label)
1880,1881c1637,1639
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< COUNTER_INC(proc_check_setauid);
---
> LABEL_DESTROY(label, MAGIC_SYNCACHE);
> COUNTER_INC(syncache_destroy_label);
> }
1882a1641,1651
> COUNTER_DECL(syncache_init_label);
> static int
> test_syncache_init_label(struct label *label, int flag)
> {
>
> if (flag & M_WAITOK)
> WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
> "test_syncache_init_label() at %s:%d", __FILE__,
> __LINE__);
> LABEL_INIT(label, MAGIC_SYNCACHE);
> COUNTER_INC(syncache_init_label);
1886c1655
< COUNTER_DECL(proc_check_setuid);
---
> COUNTER_DECL(system_check_acct);
1888c1657,1658
< test_proc_check_setuid(struct ucred *cred, uid_t uid)
---
> test_system_check_acct(struct ucred *cred, struct vnode *vp,
> struct label *vplabel)
1892c1662,1663
< COUNTER_INC(proc_check_setuid);
---
> LABEL_CHECK(vplabel, MAGIC_VNODE);
> COUNTER_INC(system_check_acct);
1897c1668
< COUNTER_DECL(proc_check_euid);
---
> COUNTER_DECL(system_check_audit);
1899c1670
< test_proc_check_seteuid(struct ucred *cred, uid_t euid)
---
> test_system_check_audit(struct ucred *cred, void *record, int length)
1903c1674
< COUNTER_INC(proc_check_euid);
---
> COUNTER_INC(system_check_audit);
1908c1679
< COUNTER_DECL(proc_check_setgid);
---
> COUNTER_DECL(system_check_auditctl);
1910c1681,1682
< test_proc_check_setgid(struct ucred *cred, gid_t gid)
---
> test_system_check_auditctl(struct ucred *cred, struct vnode *vp,
> struct label *vplabel)
1914c1686,1687
< COUNTER_INC(proc_check_setgid);
---
> LABEL_CHECK(vplabel, MAGIC_VNODE);
> COUNTER_INC(system_check_auditctl);
1919c1692
< COUNTER_DECL(proc_check_setegid);
---
> COUNTER_DECL(system_check_auditon);
1921c1694
< test_proc_check_setegid(struct ucred *cred, gid_t egid)
---
> test_system_check_auditon(struct ucred *cred, int cmd)
1925c1698
< COUNTER_INC(proc_check_setegid);
---
> COUNTER_INC(system_check_auditon);
1930c1703
< COUNTER_DECL(proc_check_setgroups);
---
> COUNTER_DECL(system_check_reboot);
1932,1933c1705
< test_proc_check_setgroups(struct ucred *cred, int ngroups,
< gid_t *gidset)
---
> test_system_check_reboot(struct ucred *cred, int how)
1937c1709
< COUNTER_INC(proc_check_setgroups);
---
> COUNTER_INC(system_check_reboot);
1942c1714
< COUNTER_DECL(proc_check_setreuid);
---
> COUNTER_DECL(system_check_swapoff);
1944c1716,1717
< test_proc_check_setreuid(struct ucred *cred, uid_t ruid, uid_t euid)
---
> test_system_check_swapoff(struct ucred *cred, struct vnode *vp,
> struct label *vplabel)
1948c1721,1722
< COUNTER_INC(proc_check_setreuid);
---
> LABEL_CHECK(vplabel, MAGIC_VNODE);
> COUNTER_INC(system_check_swapoff);
1953c1727
< COUNTER_DECL(proc_check_setregid);
---
> COUNTER_DECL(system_check_swapon);
1955c1729,1730
< test_proc_check_setregid(struct ucred *cred, gid_t rgid, gid_t egid)
---
> test_system_check_swapon(struct ucred *cred, struct vnode *vp,
> struct label *vplabel)
1959c1734,1735
< COUNTER_INC(proc_check_setregid);
---
> LABEL_CHECK(vplabel, MAGIC_VNODE);
> COUNTER_INC(system_check_swapon);
1964c1740
< COUNTER_DECL(proc_check_setresuid);
---
> COUNTER_DECL(system_check_sysctl);
1966,1967c1742,1743
< test_proc_check_setresuid(struct ucred *cred, uid_t ruid, uid_t euid,
< uid_t suid)
---
> test_system_check_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
> void *arg1, int arg2, struct sysctl_req *req)
1971c1747
< COUNTER_INC(proc_check_setresuid);
---
> COUNTER_INC(system_check_sysctl);
1976,1979c1752,1754
< COUNTER_DECL(proc_check_setresgid);
< static int
< test_proc_check_setresgid(struct ucred *cred, gid_t rgid, gid_t egid,
< gid_t sgid)
---
> COUNTER_DECL(sysvmsg_cleanup);
> static void
> test_sysvmsg_cleanup(struct label *msglabel)
1982,1983c1757,1759
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< COUNTER_INC(proc_check_setresgid);
---
> LABEL_CHECK(msglabel, MAGIC_SYSV_MSG);
> COUNTER_INC(sysvmsg_cleanup);
> }
1985c1761,1769
< return (0);
---
> COUNTER_DECL(sysvmsg_create);
> static void
> test_sysvmsg_create(struct ucred *cred, struct msqid_kernel *msqkptr,
> struct label *msqlabel, struct msg *msgptr, struct label *msglabel)
> {
>
> LABEL_CHECK(msglabel, MAGIC_SYSV_MSG);
> LABEL_CHECK(msqlabel, MAGIC_SYSV_MSQ);
> COUNTER_INC(sysvmsg_create);
1988,1990c1772,1774
< COUNTER_DECL(proc_check_wait);
< static int
< test_proc_check_wait(struct ucred *cred, struct proc *p)
---
> COUNTER_DECL(sysvmsg_destroy_label);
> static void
> test_sysvmsg_destroy_label(struct label *label)
1993,1995c1777,1779
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED);
< COUNTER_INC(proc_check_wait);
---
> LABEL_DESTROY(label, MAGIC_SYSV_MSG);
> COUNTER_INC(sysvmsg_destroy_label);
> }
1997c1781,1786
< return (0);
---
> COUNTER_DECL(sysvmsg_init_label);
> static void
> test_sysvmsg_init_label(struct label *label)
> {
> LABEL_INIT(label, MAGIC_SYSV_MSG);
> COUNTER_INC(sysvmsg_init_label);
2000c1789
< COUNTER_DECL(socket_check_accept);
---
> COUNTER_DECL(sysvmsq_check_msgmsq);
2002,2003c1791,1793
< test_socket_check_accept(struct ucred *cred, struct socket *so,
< struct label *solabel)
---
> test_sysvmsq_check_msgmsq(struct ucred *cred, struct msg *msgptr,
> struct label *msglabel, struct msqid_kernel *msqkptr,
> struct label *msqklabel)
2005a1796,1797
> LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ);
> LABEL_CHECK(msglabel, MAGIC_SYSV_MSG);
2007,2008c1799
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< COUNTER_INC(socket_check_accept);
---
> COUNTER_INC(sysvmsq_check_msgmsq);
2010c1801
< return (0);
---
> return (0);
2013c1804
< COUNTER_DECL(socket_check_bind);
---
> COUNTER_DECL(sysvmsq_check_msgrcv);
2015,2016c1806,1807
< test_socket_check_bind(struct ucred *cred, struct socket *so,
< struct label *solabel, struct sockaddr *sa)
---
> test_sysvmsq_check_msgrcv(struct ucred *cred, struct msg *msgptr,
> struct label *msglabel)
2018a1810
> LABEL_CHECK(msglabel, MAGIC_SYSV_MSG);
2020,2021c1812
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< COUNTER_INC(socket_check_bind);
---
> COUNTER_INC(sysvmsq_check_msgrcv);
2026c1817
< COUNTER_DECL(socket_check_connect);
---
> COUNTER_DECL(sysvmsq_check_msgrmid);
2028,2029c1819,1820
< test_socket_check_connect(struct ucred *cred, struct socket *so,
< struct label *solabel, struct sockaddr *sa)
---
> test_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr,
> struct label *msglabel)
2031a1823
> LABEL_CHECK(msglabel, MAGIC_SYSV_MSG);
2033,2034c1825
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< COUNTER_INC(socket_check_connect);
---
> COUNTER_INC(sysvmsq_check_msgrmid);
2039c1830
< COUNTER_DECL(socket_check_deliver);
---
> COUNTER_DECL(sysvmsq_check_msqget);
2041,2042c1832,1833
< test_socket_check_deliver(struct socket *so, struct label *solabel,
< struct mbuf *m, struct label *mlabel)
---
> test_sysvmsq_check_msqget(struct ucred *cred,
> struct msqid_kernel *msqkptr, struct label *msqklabel)
2045,2047c1836,1838
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< LABEL_CHECK(mlabel, MAGIC_MBUF);
< COUNTER_INC(socket_check_deliver);
---
> LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ);
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> COUNTER_INC(sysvmsq_check_msqget);
2052c1843
< COUNTER_DECL(socket_check_listen);
---
> COUNTER_DECL(sysvmsq_check_msqsnd);
2054,2055c1845,1846
< test_socket_check_listen(struct ucred *cred, struct socket *so,
< struct label *solabel)
---
> test_sysvmsq_check_msqsnd(struct ucred *cred,
> struct msqid_kernel *msqkptr, struct label *msqklabel)
2057a1849
> LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ);
2059,2060c1851
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< COUNTER_INC(socket_check_listen);
---
> COUNTER_INC(sysvmsq_check_msqsnd);
2065c1856
< COUNTER_DECL(socket_check_poll);
---
> COUNTER_DECL(sysvmsq_check_msqrcv);
2067,2068c1858,1859
< test_socket_check_poll(struct ucred *cred, struct socket *so,
< struct label *solabel)
---
> test_sysvmsq_check_msqrcv(struct ucred *cred,
> struct msqid_kernel *msqkptr, struct label *msqklabel)
2070a1862
> LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ);
2072,2073c1864
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< COUNTER_INC(socket_check_poll);
---
> COUNTER_INC(sysvmsq_check_msqrcv);
2078c1869
< COUNTER_DECL(socket_check_receive);
---
> COUNTER_DECL(sysvmsq_check_msqctl);
2080,2081c1871,1872
< test_socket_check_receive(struct ucred *cred, struct socket *so,
< struct label *solabel)
---
> test_sysvmsq_check_msqctl(struct ucred *cred,
> struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd)
2083a1875
> LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ);
2085,2086c1877
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< COUNTER_INC(socket_check_receive);
---
> COUNTER_INC(sysvmsq_check_msqctl);
2091,2094c1882,1884
< COUNTER_DECL(socket_check_relabel);
< static int
< test_socket_check_relabel(struct ucred *cred, struct socket *so,
< struct label *solabel, struct label *newlabel)
---
> COUNTER_DECL(sysvmsq_cleanup);
> static void
> test_sysvmsq_cleanup(struct label *msqlabel)
2097,2100c1887,1889
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< LABEL_CHECK(newlabel, MAGIC_SOCKET);
< COUNTER_INC(socket_check_relabel);
---
> LABEL_CHECK(msqlabel, MAGIC_SYSV_MSQ);
> COUNTER_INC(sysvmsq_cleanup);
> }
2102c1891,1898
< return (0);
---
> COUNTER_DECL(sysvmsq_create);
> static void
> test_sysvmsq_create(struct ucred *cred,
> struct msqid_kernel *msqkptr, struct label *msqlabel)
> {
>
> LABEL_CHECK(msqlabel, MAGIC_SYSV_MSQ);
> COUNTER_INC(sysvmsq_create);
2105,2108c1901,1903
< COUNTER_DECL(socket_check_send);
< static int
< test_socket_check_send(struct ucred *cred, struct socket *so,
< struct label *solabel)
---
> COUNTER_DECL(sysvmsq_destroy_label);
> static void
> test_sysvmsq_destroy_label(struct label *label)
2111,2113c1906,1908
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< COUNTER_INC(socket_check_send);
---
> LABEL_DESTROY(label, MAGIC_SYSV_MSQ);
> COUNTER_INC(sysvmsq_destroy_label);
> }
2115c1910,1915
< return (0);
---
> COUNTER_DECL(sysvmsq_init_label);
> static void
> test_sysvmsq_init_label(struct label *label)
> {
> LABEL_INIT(label, MAGIC_SYSV_MSQ);
> COUNTER_INC(sysvmsq_init_label);
2118c1918
< COUNTER_DECL(socket_check_stat);
---
> COUNTER_DECL(sysvsem_check_semctl);
2120,2121c1920,1921
< test_socket_check_stat(struct ucred *cred, struct socket *so,
< struct label *solabel)
---
> test_sysvsem_check_semctl(struct ucred *cred,
> struct semid_kernel *semakptr, struct label *semaklabel, int cmd)
2125,2126c1925,1926
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< COUNTER_INC(socket_check_stat);
---
> LABEL_CHECK(semaklabel, MAGIC_SYSV_SEM);
> COUNTER_INC(sysvsem_check_semctl);
2128c1928
< return (0);
---
> return (0);
2131c1931
< COUNTER_DECL(socket_check_visible);
---
> COUNTER_DECL(sysvsem_check_semget);
2133,2134c1933,1934
< test_socket_check_visible(struct ucred *cred, struct socket *so,
< struct label *solabel)
---
> test_sysvsem_check_semget(struct ucred *cred,
> struct semid_kernel *semakptr, struct label *semaklabel)
2138,2139c1938,1939
< LABEL_CHECK(solabel, MAGIC_SOCKET);
< COUNTER_INC(socket_check_visible);
---
> LABEL_CHECK(semaklabel, MAGIC_SYSV_SEM);
> COUNTER_INC(sysvsem_check_semget);
2144c1944
< COUNTER_DECL(system_check_acct);
---
> COUNTER_DECL(sysvsem_check_semop);
2146,2147c1946,1947
< test_system_check_acct(struct ucred *cred, struct vnode *vp,
< struct label *vplabel)
---
> test_sysvsem_check_semop(struct ucred *cred,
> struct semid_kernel *semakptr, struct label *semaklabel, size_t accesstype)
2151,2152c1951,1952
< LABEL_CHECK(vplabel, MAGIC_VNODE);
< COUNTER_INC(system_check_acct);
---
> LABEL_CHECK(semaklabel, MAGIC_SYSV_SEM);
> COUNTER_INC(sysvsem_check_semop);
2157,2159c1957,1959
< COUNTER_DECL(system_check_audit);
< static int
< test_system_check_audit(struct ucred *cred, void *record, int length)
---
> COUNTER_DECL(sysvsem_cleanup);
> static void
> test_sysvsem_cleanup(struct label *semalabel)
2162,2163c1962,1964
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< COUNTER_INC(system_check_audit);
---
> LABEL_CHECK(semalabel, MAGIC_SYSV_SEM);
> COUNTER_INC(sysvsem_cleanup);
> }
2165c1966,1973
< return (0);
---
> COUNTER_DECL(sysvsem_create);
> static void
> test_sysvsem_create(struct ucred *cred, struct semid_kernel *semakptr,
> struct label *semalabel)
> {
>
> LABEL_CHECK(semalabel, MAGIC_SYSV_SEM);
> COUNTER_INC(sysvsem_create);
2168,2171c1976,1978
< COUNTER_DECL(system_check_auditctl);
< static int
< test_system_check_auditctl(struct ucred *cred, struct vnode *vp,
< struct label *vplabel)
---
> COUNTER_DECL(sysvsem_destroy_label);
> static void
> test_sysvsem_destroy_label(struct label *label)
2174,2176c1981,1983
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< LABEL_CHECK(vplabel, MAGIC_VNODE);
< COUNTER_INC(system_check_auditctl);
---
> LABEL_DESTROY(label, MAGIC_SYSV_SEM);
> COUNTER_INC(sysvsem_destroy_label);
> }
2178c1985,1990
< return (0);
---
> COUNTER_DECL(sysvsem_init_label);
> static void
> test_sysvsem_init_label(struct label *label)
> {
> LABEL_INIT(label, MAGIC_SYSV_SEM);
> COUNTER_INC(sysvsem_init_label);
2181c1993
< COUNTER_DECL(system_check_auditon);
---
> COUNTER_DECL(sysvshm_check_shmat);
2183c1995,1996
< test_system_check_auditon(struct ucred *cred, int cmd)
---
> test_sysvshm_check_shmat(struct ucred *cred,
> struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg)
2187c2000,2001
< COUNTER_INC(system_check_auditon);
---
> LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM);
> COUNTER_INC(sysvshm_check_shmat);
2189c2003
< return (0);
---
> return (0);
2192c2006
< COUNTER_DECL(system_check_reboot);
---
> COUNTER_DECL(sysvshm_check_shmctl);
2194c2008,2009
< test_system_check_reboot(struct ucred *cred, int how)
---
> test_sysvshm_check_shmctl(struct ucred *cred,
> struct shmid_kernel *shmsegptr, struct label *shmseglabel, int cmd)
2198c2013,2014
< COUNTER_INC(system_check_reboot);
---
> LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM);
> COUNTER_INC(sysvshm_check_shmctl);
2200c2016
< return (0);
---
> return (0);
2203c2019
< COUNTER_DECL(system_check_swapoff);
---
> COUNTER_DECL(sysvshm_check_shmdt);
2205,2206c2021,2022
< test_system_check_swapoff(struct ucred *cred, struct vnode *vp,
< struct label *vplabel)
---
> test_sysvshm_check_shmdt(struct ucred *cred,
> struct shmid_kernel *shmsegptr, struct label *shmseglabel)
2210,2211c2026,2027
< LABEL_CHECK(vplabel, MAGIC_VNODE);
< COUNTER_INC(system_check_swapoff);
---
> LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM);
> COUNTER_INC(sysvshm_check_shmdt);
2216c2032
< COUNTER_DECL(system_check_swapon);
---
> COUNTER_DECL(sysvshm_check_shmget);
2218,2219c2034,2035
< test_system_check_swapon(struct ucred *cred, struct vnode *vp,
< struct label *vplabel)
---
> test_sysvshm_check_shmget(struct ucred *cred,
> struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg)
2223,2224c2039,2040
< LABEL_CHECK(vplabel, MAGIC_VNODE);
< COUNTER_INC(system_check_swapon);
---
> LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM);
> COUNTER_INC(sysvshm_check_shmget);
2229c2045,2089
< COUNTER_DECL(system_check_sysctl);
---
> COUNTER_DECL(sysvshm_cleanup);
> static void
> test_sysvshm_cleanup(struct label *shmlabel)
> {
>
> LABEL_CHECK(shmlabel, MAGIC_SYSV_SHM);
> COUNTER_INC(sysvshm_cleanup);
> }
>
> COUNTER_DECL(sysvshm_create);
> static void
> test_sysvshm_create(struct ucred *cred, struct shmid_kernel *shmsegptr,
> struct label *shmlabel)
> {
>
> LABEL_CHECK(shmlabel, MAGIC_SYSV_SHM);
> COUNTER_INC(sysvshm_create);
> }
>
> COUNTER_DECL(sysvshm_destroy_label);
> static void
> test_sysvshm_destroy_label(struct label *label)
> {
>
> LABEL_DESTROY(label, MAGIC_SYSV_SHM);
> COUNTER_INC(sysvshm_destroy_label);
> }
>
> COUNTER_DECL(sysvshm_init_label);
> static void
> test_sysvshm_init_label(struct label *label)
> {
> LABEL_INIT(label, MAGIC_SYSV_SHM);
> COUNTER_INC(sysvshm_init_label);
> }
>
> COUNTER_DECL(thread_userret);
> static void
> test_thread_userret(struct thread *td)
> {
>
> COUNTER_INC(thread_userret);
> }
>
> COUNTER_DECL(vnode_associate_extattr);
2231,2232c2091,2092
< test_system_check_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
< void *arg1, int arg2, struct sysctl_req *req)
---
> test_vnode_associate_extattr(struct mount *mp, struct label *mplabel,
> struct vnode *vp, struct label *vplabel)
2235,2236c2095,2097
< LABEL_CHECK(cred->cr_label, MAGIC_CRED);
< COUNTER_INC(system_check_sysctl);
---
> LABEL_CHECK(mplabel, MAGIC_MOUNT);
> LABEL_CHECK(vplabel, MAGIC_VNODE);
> COUNTER_INC(vnode_associate_extattr);
2240a2102,2112
> COUNTER_DECL(vnode_associate_singlelabel);
> static void
> test_vnode_associate_singlelabel(struct mount *mp, struct label *mplabel,
> struct vnode *vp, struct label *vplabel)
> {
>
> LABEL_CHECK(mplabel, MAGIC_MOUNT);
> LABEL_CHECK(vplabel, MAGIC_VNODE);
> COUNTER_INC(vnode_associate_singlelabel);
> }
>
2664a2537,2649
> COUNTER_DECL(vnode_copy_label);
> static void
> test_vnode_copy_label(struct label *src, struct label *dest)
> {
>
> LABEL_CHECK(src, MAGIC_VNODE);
> LABEL_CHECK(dest, MAGIC_VNODE);
> COUNTER_INC(vnode_copy_label);
> }
>
> COUNTER_DECL(vnode_create_extattr);
> static int
> test_vnode_create_extattr(struct ucred *cred, struct mount *mp,
> struct label *mplabel, struct vnode *dvp, struct label *dvplabel,
> struct vnode *vp, struct label *vplabel, struct componentname *cnp)
> {
>
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(mplabel, MAGIC_MOUNT);
> LABEL_CHECK(dvplabel, MAGIC_VNODE);
> COUNTER_INC(vnode_create_extattr);
>
> return (0);
> }
>
> COUNTER_DECL(vnode_destroy_label);
> static void
> test_vnode_destroy_label(struct label *label)
> {
>
> LABEL_DESTROY(label, MAGIC_VNODE);
> COUNTER_INC(vnode_destroy_label);
> }
>
> COUNTER_DECL(vnode_execve_transition);
> static void
> test_vnode_execve_transition(struct ucred *old, struct ucred *new,
> struct vnode *vp, struct label *filelabel,
> struct label *interpvplabel, struct image_params *imgp,
> struct label *execlabel)
> {
>
> LABEL_CHECK(old->cr_label, MAGIC_CRED);
> LABEL_CHECK(new->cr_label, MAGIC_CRED);
> LABEL_CHECK(filelabel, MAGIC_VNODE);
> LABEL_CHECK(interpvplabel, MAGIC_VNODE);
> LABEL_CHECK(execlabel, MAGIC_CRED);
> COUNTER_INC(vnode_execve_transition);
> }
>
> COUNTER_DECL(vnode_execve_will_transition);
> static int
> test_vnode_execve_will_transition(struct ucred *old, struct vnode *vp,
> struct label *filelabel, struct label *interpvplabel,
> struct image_params *imgp, struct label *execlabel)
> {
>
> LABEL_CHECK(old->cr_label, MAGIC_CRED);
> LABEL_CHECK(filelabel, MAGIC_VNODE);
> LABEL_CHECK(interpvplabel, MAGIC_VNODE);
> LABEL_CHECK(execlabel, MAGIC_CRED);
> COUNTER_INC(vnode_execve_will_transition);
>
> return (0);
> }
>
> COUNTER_DECL(vnode_externalize_label);
> static int
> test_vnode_externalize_label(struct label *label, char *element_name,
> struct sbuf *sb, int *claimed)
> {
>
> LABEL_CHECK(label, MAGIC_VNODE);
> COUNTER_INC(vnode_externalize_label);
>
> return (0);
> }
>
> COUNTER_DECL(vnode_init_label);
> static void
> test_vnode_init_label(struct label *label)
> {
>
> LABEL_INIT(label, MAGIC_VNODE);
> COUNTER_INC(vnode_init_label);
> }
>
> COUNTER_DECL(vnode_relabel);
> static void
> test_vnode_relabel(struct ucred *cred, struct vnode *vp,
> struct label *vplabel, struct label *label)
> {
>
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(vplabel, MAGIC_VNODE);
> LABEL_CHECK(label, MAGIC_VNODE);
> COUNTER_INC(vnode_relabel);
> }
>
> COUNTER_DECL(vnode_setlabel_extattr);
> static int
> test_vnode_setlabel_extattr(struct ucred *cred, struct vnode *vp,
> struct label *vplabel, struct label *intlabel)
> {
>
> LABEL_CHECK(cred->cr_label, MAGIC_CRED);
> LABEL_CHECK(vplabel, MAGIC_VNODE);
> LABEL_CHECK(intlabel, MAGIC_VNODE);
> COUNTER_INC(vnode_setlabel_extattr);
>
> return (0);
> }
>
2667,2685c2652,2654
< .mpo_bpfdesc_init_label = test_bpfdesc_init_label,
< .mpo_cred_init_label = test_cred_init_label,
< .mpo_devfs_init_label = test_devfs_init_label,
< .mpo_ifnet_init_label = test_ifnet_init_label,
< .mpo_syncache_init_label = test_syncache_init_label,
< .mpo_sysvmsg_init_label = test_sysvmsg_init_label,
< .mpo_sysvmsq_init_label = test_sysvmsq_init_label,
< .mpo_sysvsem_init_label = test_sysvsem_init_label,
< .mpo_sysvshm_init_label = test_sysvshm_init_label,
< .mpo_inpcb_init_label = test_inpcb_init_label,
< .mpo_ipq_init_label = test_ipq_init_label,
< .mpo_mbuf_init_label = test_mbuf_init_label,
< .mpo_mount_init_label = test_mount_init_label,
< .mpo_pipe_init_label = test_pipe_init_label,
< .mpo_posixsem_init_label = test_posixsem_init_label,
< .mpo_proc_init_label = test_proc_init_label,
< .mpo_socket_init_label = test_socket_init_label,
< .mpo_socketpeer_init_label = test_socketpeer_init_label,
< .mpo_vnode_init_label = test_vnode_init_label,
---
> .mpo_bpfdesc_check_receive = test_bpfdesc_check_receive,
> .mpo_bpfdesc_create = test_bpfdesc_create,
> .mpo_bpfdesc_create_mbuf = test_bpfdesc_create_mbuf,
2687,2705c2656,2659
< .mpo_cred_destroy_label = test_cred_destroy_label,
< .mpo_devfs_destroy_label = test_devfs_destroy_label,
< .mpo_ifnet_destroy_label = test_ifnet_destroy_label,
< .mpo_syncache_destroy_label = test_syncache_destroy_label,
< .mpo_sysvmsg_destroy_label = test_sysvmsg_destroy_label,
< .mpo_sysvmsq_destroy_label =
< test_sysvmsq_destroy_label,
< .mpo_sysvsem_destroy_label = test_sysvsem_destroy_label,
< .mpo_sysvshm_destroy_label = test_sysvshm_destroy_label,
< .mpo_inpcb_destroy_label = test_inpcb_destroy_label,
< .mpo_ipq_destroy_label = test_ipq_destroy_label,
< .mpo_mbuf_destroy_label = test_mbuf_destroy_label,
< .mpo_mount_destroy_label = test_mount_destroy_label,
< .mpo_pipe_destroy_label = test_pipe_destroy_label,
< .mpo_posixsem_destroy_label = test_posixsem_destroy_label,
< .mpo_proc_destroy_label = test_proc_destroy_label,
< .mpo_socket_destroy_label = test_socket_destroy_label,
< .mpo_socketpeer_destroy_label = test_socketpeer_destroy_label,
< .mpo_vnode_destroy_label = test_vnode_destroy_label,
---
> .mpo_bpfdesc_init_label = test_bpfdesc_init_label,
>
> .mpo_cred_check_relabel = test_cred_check_relabel,
> .mpo_cred_check_visible = test_cred_check_visible,
2707,2711c2661
< .mpo_ifnet_copy_label = test_ifnet_copy_label,
< .mpo_mbuf_copy_label = test_mbuf_copy_label,
< .mpo_pipe_copy_label = test_pipe_copy_label,
< .mpo_socket_copy_label = test_socket_copy_label,
< .mpo_vnode_copy_label = test_vnode_copy_label,
---
> .mpo_cred_destroy_label = test_cred_destroy_label,
2713,2717c2663
< .mpo_ifnet_externalize_label = test_ifnet_externalize_label,
< .mpo_pipe_externalize_label = test_pipe_externalize_label,
< .mpo_socket_externalize_label = test_socket_externalize_label,
< .mpo_socketpeer_externalize_label = test_socketpeer_externalize_label,
< .mpo_vnode_externalize_label = test_vnode_externalize_label,
---
> .mpo_cred_init_label = test_cred_init_label,
2719,2725c2665,2666
< .mpo_ifnet_internalize_label = test_internalize_label,
< .mpo_pipe_internalize_label = test_internalize_label,
< .mpo_socket_internalize_label = test_internalize_label,
< .mpo_vnode_internalize_label = test_internalize_label,
< .mpo_devfs_vnode_associate = test_devfs_vnode_associate,
< .mpo_vnode_associate_extattr = test_vnode_associate_extattr,
< .mpo_vnode_associate_singlelabel = test_vnode_associate_singlelabel,
---
> .mpo_cred_relabel = test_cred_relabel,
>
2729,2732c2670,2671
< .mpo_vnode_create_extattr = test_vnode_create_extattr,
< .mpo_mount_create = test_mount_create,
< .mpo_vnode_relabel = test_vnode_relabel,
< .mpo_vnode_setlabel_extattr = test_vnode_setlabel_extattr,
---
> .mpo_devfs_destroy_label = test_devfs_destroy_label,
> .mpo_devfs_init_label = test_devfs_init_label,
2734,2743c2673,2677
< .mpo_socket_create_mbuf = test_socket_create_mbuf,
< .mpo_pipe_create = test_pipe_create,
< .mpo_posixsem_create = test_posixsem_create,
< .mpo_socket_create = test_socket_create,
< .mpo_socket_newconn = test_socket_newconn,
< .mpo_pipe_relabel = test_pipe_relabel,
< .mpo_socket_relabel = test_socket_relabel,
< .mpo_socketpeer_set_from_mbuf = test_socketpeer_set_from_mbuf,
< .mpo_socketpeer_set_from_socket = test_socketpeer_set_from_socket,
< .mpo_bpfdesc_create = test_bpfdesc_create,
---
> .mpo_devfs_vnode_associate = test_devfs_vnode_associate,
>
> .mpo_ifnet_check_relabel = test_ifnet_check_relabel,
> .mpo_ifnet_check_transmit = test_ifnet_check_transmit,
> .mpo_ifnet_copy_label = test_ifnet_copy_label,
2744a2679,2701
> .mpo_ifnet_create_mbuf = test_ifnet_create_mbuf,
> .mpo_ifnet_destroy_label = test_ifnet_destroy_label,
> .mpo_ifnet_externalize_label = test_ifnet_externalize_label,
> .mpo_ifnet_init_label = test_ifnet_init_label,
> .mpo_ifnet_internalize_label = test_internalize_label,
> .mpo_ifnet_relabel = test_ifnet_relabel,
>
> .mpo_syncache_destroy_label = test_syncache_destroy_label,
> .mpo_syncache_init_label = test_syncache_init_label,
>
> .mpo_sysvmsg_destroy_label = test_sysvmsg_destroy_label,
> .mpo_sysvmsg_init_label = test_sysvmsg_init_label,
>
> .mpo_sysvmsq_destroy_label = test_sysvmsq_destroy_label,
> .mpo_sysvmsq_init_label = test_sysvmsq_init_label,
>
> .mpo_sysvsem_destroy_label = test_sysvsem_destroy_label,
> .mpo_sysvsem_init_label = test_sysvsem_init_label,
>
> .mpo_sysvshm_destroy_label = test_sysvshm_destroy_label,
> .mpo_sysvshm_init_label = test_sysvshm_init_label,
>
> .mpo_inpcb_check_deliver = test_inpcb_check_deliver,
2746,2754d2702
< .mpo_syncache_create = test_syncache_create,
< .mpo_syncache_create_mbuf = test_syncache_create_mbuf,
< .mpo_sysvmsg_create = test_sysvmsg_create,
< .mpo_sysvmsq_create = test_sysvmsq_create,
< .mpo_sysvsem_create = test_sysvsem_create,
< .mpo_sysvshm_create = test_sysvshm_create,
< .mpo_ipq_reassemble = test_ipq_reassemble,
< .mpo_netinet_fragment = test_netinet_fragment,
< .mpo_ipq_create = test_ipq_create,
2756,2757c2704,2710
< .mpo_bpfdesc_create_mbuf = test_bpfdesc_create_mbuf,
< .mpo_ifnet_create_mbuf = test_ifnet_create_mbuf,
---
> .mpo_inpcb_destroy_label = test_inpcb_destroy_label,
> .mpo_inpcb_init_label = test_inpcb_init_label,
> .mpo_inpcb_sosetlabel = test_inpcb_sosetlabel,
>
> .mpo_ipq_create = test_ipq_create,
> .mpo_ipq_destroy_label = test_ipq_destroy_label,
> .mpo_ipq_init_label = test_ipq_init_label,
2759,2766c2712
< .mpo_netatalk_aarp_send = test_netatalk_aarp_send,
< .mpo_netinet_arp_send = test_netinet_arp_send,
< .mpo_netinet_icmp_reply = test_netinet_icmp_reply,
< .mpo_netinet_icmp_replyinplace = test_netinet_icmp_replyinplace,
< .mpo_netinet_igmp_send = test_netinet_igmp_send,
< .mpo_netinet_tcp_reply = test_netinet_tcp_reply,
< .mpo_netinet6_nd6_send = test_netinet6_nd6_send,
< .mpo_ifnet_relabel = test_ifnet_relabel,
---
> .mpo_ipq_reassemble = test_ipq_reassemble,
2768,2799c2714
< .mpo_inpcb_sosetlabel = test_inpcb_sosetlabel,
< .mpo_vnode_execve_transition = test_vnode_execve_transition,
< .mpo_vnode_execve_will_transition =
< test_vnode_execve_will_transition,
< .mpo_proc_create_swapper = test_proc_create_swapper,
< .mpo_proc_create_init = test_proc_create_init,
< .mpo_cred_relabel = test_cred_relabel,
< .mpo_thread_userret = test_thread_userret,
< .mpo_sysvmsg_cleanup = test_sysvmsg_cleanup,
< .mpo_sysvmsq_cleanup = test_sysvmsq_cleanup,
< .mpo_sysvsem_cleanup = test_sysvsem_cleanup,
< .mpo_sysvshm_cleanup = test_sysvshm_cleanup,
< .mpo_bpfdesc_check_receive = test_bpfdesc_check_receive,
< .mpo_cred_check_relabel = test_cred_check_relabel,
< .mpo_cred_check_visible = test_cred_check_visible,
< .mpo_ifnet_check_relabel = test_ifnet_check_relabel,
< .mpo_ifnet_check_transmit = test_ifnet_check_transmit,
< .mpo_inpcb_check_deliver = test_inpcb_check_deliver,
< .mpo_sysvmsq_check_msgmsq = test_sysvmsq_check_msgmsq,
< .mpo_sysvmsq_check_msgrcv = test_sysvmsq_check_msgrcv,
< .mpo_sysvmsq_check_msgrmid = test_sysvmsq_check_msgrmid,
< .mpo_sysvmsq_check_msqget = test_sysvmsq_check_msqget,
< .mpo_sysvmsq_check_msqsnd = test_sysvmsq_check_msqsnd,
< .mpo_sysvmsq_check_msqrcv = test_sysvmsq_check_msqrcv,
< .mpo_sysvmsq_check_msqctl = test_sysvmsq_check_msqctl,
< .mpo_sysvsem_check_semctl = test_sysvsem_check_semctl,
< .mpo_sysvsem_check_semget = test_sysvsem_check_semget,
< .mpo_sysvsem_check_semop = test_sysvsem_check_semop,
< .mpo_sysvshm_check_shmat = test_sysvshm_check_shmat,
< .mpo_sysvshm_check_shmctl = test_sysvshm_check_shmctl,
< .mpo_sysvshm_check_shmdt = test_sysvshm_check_shmdt,
< .mpo_sysvshm_check_shmget = test_sysvshm_check_shmget,
---
>
2803a2719
>
2805a2722,2726
>
> .mpo_mbuf_copy_label = test_mbuf_copy_label,
> .mpo_mbuf_destroy_label = test_mbuf_destroy_label,
> .mpo_mbuf_init_label = test_mbuf_init_label,
>
2806a2728,2742
> .mpo_mount_create = test_mount_create,
> .mpo_mount_destroy_label = test_mount_destroy_label,
> .mpo_mount_init_label = test_mount_init_label,
>
> .mpo_netatalk_aarp_send = test_netatalk_aarp_send,
>
> .mpo_netinet_arp_send = test_netinet_arp_send,
> .mpo_netinet_fragment = test_netinet_fragment,
> .mpo_netinet_icmp_reply = test_netinet_icmp_reply,
> .mpo_netinet_icmp_replyinplace = test_netinet_icmp_replyinplace,
> .mpo_netinet_igmp_send = test_netinet_igmp_send,
> .mpo_netinet_tcp_reply = test_netinet_tcp_reply,
>
> .mpo_netinet6_nd6_send = test_netinet6_nd6_send,
>
2812a2749,2756
> .mpo_pipe_copy_label = test_pipe_copy_label,
> .mpo_pipe_create = test_pipe_create,
> .mpo_pipe_destroy_label = test_pipe_destroy_label,
> .mpo_pipe_externalize_label = test_pipe_externalize_label,
> .mpo_pipe_init_label = test_pipe_init_label,
> .mpo_pipe_internalize_label = test_internalize_label,
> .mpo_pipe_relabel = test_pipe_relabel,
>
2818a2763,2766
> .mpo_posixsem_create = test_posixsem_create,
> .mpo_posixsem_destroy_label = test_posixsem_destroy_label,
> .mpo_posixsem_init_label = test_posixsem_init_label,
>
2824d2771
< .mpo_proc_check_setuid = test_proc_check_setuid,
2826d2772
< .mpo_proc_check_setgid = test_proc_check_setgid,
2827a2774
> .mpo_proc_check_setgid = test_proc_check_setgid,
2829d2775
< .mpo_proc_check_setreuid = test_proc_check_setreuid,
2831d2776
< .mpo_proc_check_setresuid = test_proc_check_setresuid,
2832a2778,2780
> .mpo_proc_check_setresuid = test_proc_check_setresuid,
> .mpo_proc_check_setreuid = test_proc_check_setreuid,
> .mpo_proc_check_setuid = test_proc_check_setuid,
2834a2783,2787
> .mpo_proc_create_init = test_proc_create_init,
> .mpo_proc_create_swapper = test_proc_create_swapper,
> .mpo_proc_destroy_label = test_proc_destroy_label,
> .mpo_proc_init_label = test_proc_init_label,
>
2845a2799,2817
> .mpo_socket_copy_label = test_socket_copy_label,
> .mpo_socket_create = test_socket_create,
> .mpo_socket_create_mbuf = test_socket_create_mbuf,
> .mpo_socket_destroy_label = test_socket_destroy_label,
> .mpo_socket_externalize_label = test_socket_externalize_label,
> .mpo_socket_init_label = test_socket_init_label,
> .mpo_socket_internalize_label = test_internalize_label,
> .mpo_socket_newconn = test_socket_newconn,
> .mpo_socket_relabel = test_socket_relabel,
>
> .mpo_socketpeer_destroy_label = test_socketpeer_destroy_label,
> .mpo_socketpeer_externalize_label = test_socketpeer_externalize_label,
> .mpo_socketpeer_init_label = test_socketpeer_init_label,
> .mpo_socketpeer_set_from_mbuf = test_socketpeer_set_from_mbuf,
> .mpo_socketpeer_set_from_socket = test_socketpeer_set_from_socket,
>
> .mpo_syncache_create = test_syncache_create,
> .mpo_syncache_create_mbuf = test_syncache_create_mbuf,
>
2853a2826
>
2854a2828,2857
> .mpo_sysvmsg_cleanup = test_sysvmsg_cleanup,
> .mpo_sysvmsg_create = test_sysvmsg_create,
>
> .mpo_sysvmsq_check_msgmsq = test_sysvmsq_check_msgmsq,
> .mpo_sysvmsq_check_msgrcv = test_sysvmsq_check_msgrcv,
> .mpo_sysvmsq_check_msgrmid = test_sysvmsq_check_msgrmid,
> .mpo_sysvmsq_check_msqget = test_sysvmsq_check_msqget,
> .mpo_sysvmsq_check_msqsnd = test_sysvmsq_check_msqsnd,
> .mpo_sysvmsq_check_msqrcv = test_sysvmsq_check_msqrcv,
> .mpo_sysvmsq_check_msqctl = test_sysvmsq_check_msqctl,
> .mpo_sysvmsq_cleanup = test_sysvmsq_cleanup,
> .mpo_sysvmsq_create = test_sysvmsq_create,
>
> .mpo_sysvsem_check_semctl = test_sysvsem_check_semctl,
> .mpo_sysvsem_check_semget = test_sysvsem_check_semget,
> .mpo_sysvsem_check_semop = test_sysvsem_check_semop,
> .mpo_sysvsem_cleanup = test_sysvsem_cleanup,
> .mpo_sysvsem_create = test_sysvsem_create,
>
> .mpo_sysvshm_check_shmat = test_sysvshm_check_shmat,
> .mpo_sysvshm_check_shmctl = test_sysvshm_check_shmctl,
> .mpo_sysvshm_check_shmdt = test_sysvshm_check_shmdt,
> .mpo_sysvshm_check_shmget = test_sysvshm_check_shmget,
> .mpo_sysvshm_cleanup = test_sysvshm_cleanup,
> .mpo_sysvshm_create = test_sysvshm_create,
>
> .mpo_thread_userret = test_thread_userret,
>
> .mpo_vnode_associate_extattr = test_vnode_associate_extattr,
> .mpo_vnode_associate_singlelabel = test_vnode_associate_singlelabel,
2884a2888,2897
> .mpo_vnode_copy_label = test_vnode_copy_label,
> .mpo_vnode_create_extattr = test_vnode_create_extattr,
> .mpo_vnode_destroy_label = test_vnode_destroy_label,
> .mpo_vnode_execve_transition = test_vnode_execve_transition,
> .mpo_vnode_execve_will_transition = test_vnode_execve_will_transition,
> .mpo_vnode_externalize_label = test_vnode_externalize_label,
> .mpo_vnode_init_label = test_vnode_init_label,
> .mpo_vnode_internalize_label = test_internalize_label,
> .mpo_vnode_relabel = test_vnode_relabel,
> .mpo_vnode_setlabel_extattr = test_vnode_setlabel_extattr,