From owner-p4-projects@FreeBSD.ORG Sat May 14 00:33:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EF4B16A4D1; Sat, 14 May 2005 00:33:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C76316A4CE for ; Sat, 14 May 2005 00:33:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECDDA43D88 for ; Sat, 14 May 2005 00:33:27 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4E0XR2T027008 for ; Sat, 14 May 2005 00:33:27 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4E0XROJ027005 for perforce@freebsd.org; Sat, 14 May 2005 00:33:27 GMT (envelope-from wsalamon@computer.org) Date: Sat, 14 May 2005 00:33:27 GMT Message-Id: <200505140033.j4E0XROJ027005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 76947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 May 2005 00:33:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=76947 Change 76947 by wsalamon@rickenbacker on 2005/05/14 00:33:07 Changes necessary for kernel support. The vnode auditing uses a audit-specific record to contain the audit info to save space. Add the Unix socket tokenizer function. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#10 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#10 (text+ko) ==== @@ -211,7 +211,7 @@ struct sockaddr_in6; struct sockaddr_un; #if defined(_KERNEL) || defined(KERNEL) -struct vattr; +struct vnode_au_info; #endif int au_open(void); @@ -219,11 +219,22 @@ int au_close(int d, int keep, short event); int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen); +#if defined(KERNEL) || defined(_KERNEL) +token_t *au_to_file(char *file, struct timeval tm); +#else token_t *au_to_file(char *file); +#endif +#if defined(KERNEL) || defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, + au_emod_t e_mod, struct timeval tm); +token_t *au_to_header32(int rec_size, au_event_t e_type, + au_emod_t e_mod, struct timeval tm); +#else +token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); +#endif token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_me(void); @@ -232,9 +243,9 @@ token_t *au_to_arg32(char n, char *text, u_int32_t v); token_t *au_to_arg64(char n, char *text, u_int64_t v); #if defined(_KERNEL) || defined(KERNEL) -token_t *au_to_attr(struct vattr *attr); -token_t *au_to_attr32(struct vattr *attr); -token_t *au_to_attr64(struct vattr *attr); +token_t *au_to_attr(struct vnode_au_info *vni); +token_t *au_to_attr32(struct vnode_au_info *vni); +token_t *au_to_attr64(struct vnode_au_info *vni); #endif token_t *au_to_data(char unit_print, char unit_type, char unit_count, char *p); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#14 (text+ko) ==== @@ -36,6 +36,7 @@ #endif /* __APPLE__*/ #include #include +#include #include @@ -144,7 +145,7 @@ return au_to_arg32(n, text, v); } -#if defined(_KERNEL) || defined(_KERNEL) +#if defined(_KERNEL) || defined(KERNEL) /* * token ID 1 byte * file access mode 4 bytes @@ -154,14 +155,14 @@ * node ID 8 bytes * device 4 bytes/8 bytes (32-bit/64-bit) */ -token_t *au_to_attr32(struct vattr *attr) +token_t *au_to_attr32(struct vnode_au_info *vni) { token_t *t; u_char *dptr = NULL; u_int16_t pad0_16 = 0; u_int16_t pad0_32 = 0; - if(attr == NULL) { + if(vni == NULL) { errno = EINVAL; return NULL; } @@ -179,11 +180,11 @@ * as 2 bytes; BSM defines 4 so pad with 0 */ ADD_U_INT16(dptr, pad0_16); - ADD_U_INT16(dptr, attr->va_mode); + ADD_U_INT16(dptr, vni->vn_mode); - ADD_U_INT32(dptr, attr->va_uid); - ADD_U_INT32(dptr, attr->va_gid); - ADD_U_INT32(dptr, attr->va_fsid); + ADD_U_INT32(dptr, vni->vn_uid); + ADD_U_INT32(dptr, vni->vn_gid); + ADD_U_INT32(dptr, vni->vn_fsid); /* * Some systems use 32-bit file ID's, other's use 64-bit file IDs. @@ -191,29 +192,29 @@ * could pick this out at compile-time, it would be better, so as to * avoid the else case below. */ - if (sizeof(attr->va_fileid) == sizeof(uint32_t)) { + if (sizeof(vni->vn_fileid) == sizeof(uint32_t)) { ADD_U_INT32(dptr, pad0_32); - ADD_U_INT32(dptr, attr->va_fileid); - } else if (sizeof(attr->va_fileid) == sizeof(uint64_t)) { - ADD_U_INT64(dptr, attr->va_fileid); + ADD_U_INT32(dptr, vni->vn_fileid); + } else if (sizeof(vni->vn_fileid) == sizeof(uint64_t)) { + ADD_U_INT64(dptr, vni->vn_fileid); } else { ADD_U_INT64(dptr, 0LL); } - ADD_U_INT32(dptr, attr->va_rdev); + ADD_U_INT32(dptr, vni->vn_dev); return t; } -token_t *au_to_attr64(struct vattr *attr) +token_t *au_to_attr64(struct vnode_au_info *vni) { errno = ENOTSUP; return NULL; } -token_t *au_to_attr(struct vattr *attr) +token_t *au_to_attr(struct vnode_au_info *vni) { - return au_to_attr32(attr); + return au_to_attr32(vni); } #endif /* !(defined(_KERNEL) || defined(KERNEL) */ @@ -553,18 +554,24 @@ * file name len 2 bytes * file pathname N bytes + 1 terminating NULL byte */ +#if defined(KERNEL) || defined(_KERNEL) +token_t *au_to_file(char *file, struct timeval tm) +#else token_t *au_to_file(char *file) +#endif { token_t *t; u_char *dptr = NULL; u_int16_t filelen; + u_int32_t timems; +#if !defined(KERNEL) && !defined(_KERNEL) struct timeval tm; struct timezone tzp; - u_int32_t timems; if(gettimeofday(&tm, &tzp) == -1) { return NULL; } +#endif if(file == NULL) { errno = EINVAL; @@ -884,7 +891,34 @@ return NULL; } +/* + * token ID 1 byte + * socket family 2 bytes + * path 104 bytes + */ +token_t *au_to_sock_unix(struct sockaddr_un *so) +{ + token_t *t; + u_char *dptr; + + if(so == NULL) { + return NULL; + } + + GET_TOKEN_AREA(t, dptr, 107); + if(t == NULL) { + return NULL; + } + + ADD_U_CHAR(dptr, AU_SOCK_UNIX_TOKEN); + /* BSM token has two bytes for family */ + ADD_U_CHAR(dptr, 0); + ADD_U_CHAR(dptr, so->sun_family); + ADD_STRING(dptr, so->sun_path, strlen(so->sun_path)); + return t; +} + /* * token ID 1 byte * socket family 2 bytes @@ -1085,6 +1119,7 @@ pid, sid, tid); } +#if !defined(_KERNEL) && !defined(KERNEL) /* * Collects audit information for the current process * and creates a subject token from it @@ -1103,6 +1138,7 @@ &auinfo.ai_termid); } +#endif /* * token ID 1 byte @@ -1207,17 +1243,24 @@ * seconds of time 4 bytes/8 bytes (32-bit/64-bit value) * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) */ +#if defined(KERNEL) || defined(_KERNEL) token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) + struct timeval tm) +#else +token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) +#endif { token_t *t; u_char *dptr = NULL; + u_int32_t timems; +#if !defined(KERNEL) && !defined(_KERNEL) struct timeval tm; struct timezone tzp; - u_int32_t timems; if(gettimeofday(&tm, &tzp) == -1) { return NULL; } +#endif GET_TOKEN_AREA(t, dptr, 18); if(t == NULL) {