42c42
< __FBSDID("$FreeBSD: head/sys/security/mac/mac_socket.c 165469 2006-12-22 23:34:47Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/security/mac/mac_socket.c 168955 2007-04-22 19:55:56Z rwatson $");
158c158
< mac_destroy_socket(struct socket *socket)
---
> mac_destroy_socket(struct socket *so)
161,164c161,164
< mac_socket_label_free(socket->so_label);
< socket->so_label = NULL;
< mac_socket_peer_label_free(socket->so_peerlabel);
< socket->so_peerlabel = NULL;
---
> mac_socket_label_free(so->so_label);
> so->so_label = NULL;
> mac_socket_peer_label_free(so->so_peerlabel);
> so->so_peerlabel = NULL;
207c207
< mac_create_socket(struct ucred *cred, struct socket *socket)
---
> mac_create_socket(struct ucred *cred, struct socket *so)
210c210
< MAC_PERFORM(create_socket, cred, socket, socket->so_label);
---
> MAC_PERFORM(create_socket, cred, so, so->so_label);
214,215c214
< mac_create_socket_from_socket(struct socket *oldsocket,
< struct socket *newsocket)
---
> mac_create_socket_from_socket(struct socket *oldso, struct socket *newso)
218,220c217,220
< SOCK_LOCK_ASSERT(oldsocket);
< MAC_PERFORM(create_socket_from_socket, oldsocket, oldsocket->so_label,
< newsocket, newsocket->so_label);
---
> SOCK_LOCK_ASSERT(oldso);
>
> MAC_PERFORM(create_socket_from_socket, oldso, oldso->so_label, newso,
> newso->so_label);
224c224
< mac_relabel_socket(struct ucred *cred, struct socket *socket,
---
> mac_relabel_socket(struct ucred *cred, struct socket *so,
228,229c228,230
< SOCK_LOCK_ASSERT(socket);
< MAC_PERFORM(relabel_socket, cred, socket, socket->so_label, newlabel);
---
> SOCK_LOCK_ASSERT(so);
>
> MAC_PERFORM(relabel_socket, cred, so, so->so_label, newlabel);
233c234
< mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket)
---
> mac_set_socket_peer_from_mbuf(struct mbuf *m, struct socket *so)
237c238
< SOCK_LOCK_ASSERT(socket);
---
> SOCK_LOCK_ASSERT(so);
239c240
< label = mac_mbuf_to_label(mbuf);
---
> label = mac_mbuf_to_label(m);
241,242c242,243
< MAC_PERFORM(set_socket_peer_from_mbuf, mbuf, label, socket,
< socket->so_peerlabel);
---
> MAC_PERFORM(set_socket_peer_from_mbuf, m, label, so,
> so->so_peerlabel);
246,247c247
< mac_set_socket_peer_from_socket(struct socket *oldsocket,
< struct socket *newsocket)
---
> mac_set_socket_peer_from_socket(struct socket *oldso, struct socket *newso)
255,256c255,256
< MAC_PERFORM(set_socket_peer_from_socket, oldsocket,
< oldsocket->so_label, newsocket, newsocket->so_peerlabel);
---
> MAC_PERFORM(set_socket_peer_from_socket, oldso, oldso->so_label,
> newso, newso->so_peerlabel);
260c260
< mac_create_mbuf_from_socket(struct socket *socket, struct mbuf *mbuf)
---
> mac_create_mbuf_from_socket(struct socket *so, struct mbuf *m)
264c264
< label = mac_mbuf_to_label(mbuf);
---
> SOCK_LOCK_ASSERT(so);
266,268c266,268
< SOCK_LOCK_ASSERT(socket);
< MAC_PERFORM(create_mbuf_from_socket, socket, socket->so_label, mbuf,
< label);
---
> label = mac_mbuf_to_label(m);
>
> MAC_PERFORM(create_mbuf_from_socket, so, so->so_label, m, label);
272c272
< mac_check_socket_accept(struct ucred *cred, struct socket *socket)
---
> mac_check_socket_accept(struct ucred *cred, struct socket *so)
276c276
< SOCK_LOCK_ASSERT(socket);
---
> SOCK_LOCK_ASSERT(so);
278c278
< MAC_CHECK(check_socket_accept, cred, socket, socket->so_label);
---
> MAC_CHECK(check_socket_accept, cred, so, so->so_label);
284,285c284,285
< mac_check_socket_bind(struct ucred *ucred, struct socket *socket,
< struct sockaddr *sockaddr)
---
> mac_check_socket_bind(struct ucred *ucred, struct socket *so,
> struct sockaddr *sa)
289c289
< SOCK_LOCK_ASSERT(socket);
---
> SOCK_LOCK_ASSERT(so);
291,292c291
< MAC_CHECK(check_socket_bind, ucred, socket, socket->so_label,
< sockaddr);
---
> MAC_CHECK(check_socket_bind, ucred, so, so->so_label, sa);
298,299c297,298
< mac_check_socket_connect(struct ucred *cred, struct socket *socket,
< struct sockaddr *sockaddr)
---
> mac_check_socket_connect(struct ucred *cred, struct socket *so,
> struct sockaddr *sa)
303c302
< SOCK_LOCK_ASSERT(socket);
---
> SOCK_LOCK_ASSERT(so);
305,306c304
< MAC_CHECK(check_socket_connect, cred, socket, socket->so_label,
< sockaddr);
---
> MAC_CHECK(check_socket_connect, cred, so, so->so_label, sa);
312,313c310
< mac_check_socket_create(struct ucred *cred, int domain, int type,
< int protocol)
---
> mac_check_socket_create(struct ucred *cred, int domain, int type, int proto)
317c314
< MAC_CHECK(check_socket_create, cred, domain, type, protocol);
---
> MAC_CHECK(check_socket_create, cred, domain, type, proto);
323c320
< mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf)
---
> mac_check_socket_deliver(struct socket *so, struct mbuf *m)
328c325
< SOCK_LOCK_ASSERT(socket);
---
> SOCK_LOCK_ASSERT(so);
330c327
< label = mac_mbuf_to_label(mbuf);
---
> label = mac_mbuf_to_label(m);
332,333c329
< MAC_CHECK(check_socket_deliver, socket, socket->so_label, mbuf,
< label);
---
> MAC_CHECK(check_socket_deliver, so, so->so_label, m, label);
339c335
< mac_check_socket_listen(struct ucred *cred, struct socket *socket)
---
> mac_check_socket_listen(struct ucred *cred, struct socket *so)
343c339
< SOCK_LOCK_ASSERT(socket);
---
> SOCK_LOCK_ASSERT(so);
345c341,342
< MAC_CHECK(check_socket_listen, cred, socket, socket->so_label);
---
> MAC_CHECK(check_socket_listen, cred, so, so->so_label);
>
356a354
>
373c371
< mac_check_socket_relabel(struct ucred *cred, struct socket *socket,
---
> mac_check_socket_relabel(struct ucred *cred, struct socket *so,
378c376
< SOCK_LOCK_ASSERT(socket);
---
> SOCK_LOCK_ASSERT(so);
380,381c378
< MAC_CHECK(check_socket_relabel, cred, socket, socket->so_label,
< newlabel);
---
> MAC_CHECK(check_socket_relabel, cred, so, so->so_label, newlabel);
411c408
< mac_check_socket_visible(struct ucred *cred, struct socket *socket)
---
> mac_check_socket_visible(struct ucred *cred, struct socket *so)
415c412
< SOCK_LOCK_ASSERT(socket);
---
> SOCK_LOCK_ASSERT(so);
417c414
< MAC_CHECK(check_socket_visible, cred, socket, socket->so_label);
---
> MAC_CHECK(check_socket_visible, cred, so, so->so_label);