From owner-svn-src-head@freebsd.org Tue Sep 1 21:26:03 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9EFBB3799EA; Tue, 1 Sep 2020 21:26:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Vg3lS9z4KbH; Tue, 1 Sep 2020 21:26:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 63FCE1F75D; Tue, 1 Sep 2020 21:26:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LQ3WM024838; Tue, 1 Sep 2020 21:26:03 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LQ0Uh024825; Tue, 1 Sep 2020 21:26:00 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012126.081LQ0Uh024825@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:26:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365083 - in head/sys/security: audit mac mac_biba mac_lomac mac_mls mac_stub mac_veriexec mac_veriexec_parser X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/security: audit mac mac_biba mac_lomac mac_mls mac_stub mac_veriexec mac_veriexec_parser X-SVN-Commit-Revision: 365083 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:26:03 -0000 Author: mjg Date: Tue Sep 1 21:26:00 2020 New Revision: 365083 URL: https://svnweb.freebsd.org/changeset/base/365083 Log: security: clean up empty lines in .c and .h files Modified: head/sys/security/audit/audit_bsm.c head/sys/security/audit/audit_dtrace.c head/sys/security/audit/audit_syscalls.c head/sys/security/audit/bsm_token.c head/sys/security/mac/mac_internal.h head/sys/security/mac/mac_label.c head/sys/security/mac/mac_socket.c head/sys/security/mac_biba/mac_biba.c head/sys/security/mac_lomac/mac_lomac.c head/sys/security/mac_mls/mac_mls.c head/sys/security/mac_stub/mac_stub.c head/sys/security/mac_veriexec/veriexec_metadata.c head/sys/security/mac_veriexec_parser/mac_veriexec_parser.c Modified: head/sys/security/audit/audit_bsm.c ============================================================================== --- head/sys/security/audit/audit_bsm.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/audit/audit_bsm.c Tue Sep 1 21:26:00 2020 (r365083) @@ -318,7 +318,6 @@ kau_free(struct au_record *rec) } \ } while (0) - /* * Implement auditing for the auditon() system call. The audit tokens that * are generated depend on the command that was sent into the auditon() Modified: head/sys/security/audit/audit_dtrace.c ============================================================================== --- head/sys/security/audit/audit_dtrace.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/audit/audit_dtrace.c Tue Sep 1 21:26:00 2020 (r365083) @@ -383,7 +383,6 @@ dtaudit_au_evnamemap_callback(struct evname_elem *ene) if ((ene->ene_commit_probe_id == 0) && (dtrace_probe_lookup(dtaudit_id, dtaudit_module_str, ene_name_lower, dtaudit_name_commit_str) == 0)) { - /* * Create the commit probe. * @@ -413,7 +412,6 @@ dtaudit_au_evnamemap_callback(struct evname_elem *ene) if ((ene->ene_bsm_probe_id == 0) && (dtrace_probe_lookup(dtaudit_id, dtaudit_module_str, ene_name_lower, dtaudit_name_bsm_str) == 0)) { - /* * Create the bsm probe. * Modified: head/sys/security/audit/audit_syscalls.c ============================================================================== --- head/sys/security/audit/audit_syscalls.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/audit/audit_syscalls.c Tue Sep 1 21:26:00 2020 (r365083) @@ -90,7 +90,6 @@ sys_audit(struct thread *td, struct audit_args *uap) * commit the user audit record. */ if (ar == NULL) { - /* * This is not very efficient; we're required to allocate a * complete kernel audit record just so the user record can Modified: head/sys/security/audit/bsm_token.c ============================================================================== --- head/sys/security/audit/bsm_token.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/audit/bsm_token.c Tue Sep 1 21:26:00 2020 (r365083) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include - #include #include #include @@ -341,7 +340,6 @@ au_to_data(char unit_print, char unit_type, char unit_ return (t); } - /* * token ID 1 byte Modified: head/sys/security/mac/mac_internal.h ============================================================================== --- head/sys/security/mac/mac_internal.h Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac/mac_internal.h Tue Sep 1 21:26:00 2020 (r365083) @@ -160,7 +160,6 @@ struct label { intptr_t l_perpolicy[MAC_MAX_SLOTS]; }; - /* * Flags for mac_labeled, a bitmask of object types need across the union of * all policies currently registered with the MAC Framework, used to key Modified: head/sys/security/mac/mac_label.c ============================================================================== --- head/sys/security/mac/mac_label.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac/mac_label.c Tue Sep 1 21:26:00 2020 (r365083) @@ -93,7 +93,6 @@ mac_destroy_label(struct label *label) #endif } - static int mac_labelzone_ctor(void *mem, int size, void *arg, int flags) { Modified: head/sys/security/mac/mac_socket.c ============================================================================== --- head/sys/security/mac/mac_socket.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac/mac_socket.c Tue Sep 1 21:26:00 2020 (r365083) @@ -275,7 +275,7 @@ mac_socketpeer_set_from_mbuf(struct mbuf *m, struct so void mac_socketpeer_set_from_socket(struct socket *oldso, struct socket *newso) { - + if (mac_policy_count == 0) return; Modified: head/sys/security/mac_biba/mac_biba.c ============================================================================== --- head/sys/security/mac_biba/mac_biba.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_biba/mac_biba.c Tue Sep 1 21:26:00 2020 (r365083) @@ -2745,7 +2745,7 @@ biba_sysvshm_check_shmat(struct ucred *cred, struct sh if (!biba_dominate_effective(subj, obj)) return (EACCES); } - + return (0); } Modified: head/sys/security/mac_lomac/mac_lomac.c ============================================================================== --- head/sys/security/mac_lomac/mac_lomac.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_lomac/mac_lomac.c Tue Sep 1 21:26:00 2020 (r365083) @@ -731,7 +731,7 @@ lomac_parse_element(struct mac_lomac_element *element, p0 = string; d = strtol(p0, &p1, 10); - + if (d < 0 || d > 65535) return (EINVAL); element->mle_type = MAC_LOMAC_TYPE_GRADE; Modified: head/sys/security/mac_mls/mac_mls.c ============================================================================== --- head/sys/security/mac_mls/mac_mls.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_mls/mac_mls.c Tue Sep 1 21:26:00 2020 (r365083) @@ -2378,7 +2378,7 @@ mls_sysvshm_check_shmat(struct ucred *cred, struct shm if (!mls_dominate_effective(obj, subj)) return (EACCES); } - + return (0); } @@ -3371,7 +3371,6 @@ static struct mac_policy_ops mls_ops = .mpo_sysvshm_create = mls_sysvshm_create, .mpo_sysvshm_destroy_label = mls_destroy_label, .mpo_sysvshm_init_label = mls_init_label, - .mpo_system_check_acct = mls_system_check_acct, .mpo_system_check_auditctl = mls_system_check_auditctl, Modified: head/sys/security/mac_stub/mac_stub.c ============================================================================== --- head/sys/security/mac_stub/mac_stub.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_stub/mac_stub.c Tue Sep 1 21:26:00 2020 (r365083) @@ -1181,7 +1181,6 @@ stub_sysvmsq_check_msgrcv(struct ucred *cred, struct m return (0); } - static int stub_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr, struct label *msglabel) @@ -1190,7 +1189,6 @@ stub_sysvmsq_check_msgrmid(struct ucred *cred, struct return (0); } - static int stub_sysvmsq_check_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) @@ -1199,7 +1197,6 @@ stub_sysvmsq_check_msqget(struct ucred *cred, struct m return (0); } - static int stub_sysvmsq_check_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) @@ -1216,7 +1213,6 @@ stub_sysvmsq_check_msqrcv(struct ucred *cred, struct m return (0); } - static int stub_sysvmsq_check_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd) @@ -1225,7 +1221,6 @@ stub_sysvmsq_check_msqctl(struct ucred *cred, struct m return (0); } - static void stub_sysvmsq_cleanup(struct label *msqlabel) { @@ -1255,7 +1250,6 @@ stub_sysvsem_check_semget(struct ucred *cred, struct s return (0); } - static int stub_sysvsem_check_semop(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, size_t accesstype) @@ -1300,7 +1294,6 @@ stub_sysvshm_check_shmdt(struct ucred *cred, struct sh return (0); } - static int stub_sysvshm_check_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, Modified: head/sys/security/mac_veriexec/veriexec_metadata.c ============================================================================== --- head/sys/security/mac_veriexec/veriexec_metadata.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_veriexec/veriexec_metadata.c Tue Sep 1 21:26:00 2020 (r365083) @@ -773,7 +773,6 @@ mac_veriexec_metadata_get_file_info(dev_t fsid, long f return (ip); } - /** * @brief Intialize the meta-data store */ Modified: head/sys/security/mac_veriexec_parser/mac_veriexec_parser.c ============================================================================== --- head/sys/security/mac_veriexec_parser/mac_veriexec_parser.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_veriexec_parser/mac_veriexec_parser.c Tue Sep 1 21:26:00 2020 (r365083) @@ -233,7 +233,6 @@ verify_digest(const char *data, size_t len, const unsi return (memcmp(expected_hash, hash, SHA256_DIGEST_LENGTH)); } - static int open_file(const char *path, struct nameidata *nid) {