From owner-svn-src-all@freebsd.org Fri May 17 18:06:26 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EADFF159C34E; Fri, 17 May 2019 18:06:25 +0000 (UTC) (envelope-from stevek@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) server-signature RSA-PSS (4096 bits) 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 8E0AE864C0; Fri, 17 May 2019 18:06:25 +0000 (UTC) (envelope-from stevek@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 779D9BF3D; Fri, 17 May 2019 18:06:25 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4HI6PTV091157; Fri, 17 May 2019 18:06:25 GMT (envelope-from stevek@FreeBSD.org) Received: (from stevek@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4HI6PQn091156; Fri, 17 May 2019 18:06:25 GMT (envelope-from stevek@FreeBSD.org) Message-Id: <201905171806.x4HI6PQn091156@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stevek set sender to stevek@FreeBSD.org using -f From: "Stephen J. Kiernan" Date: Fri, 17 May 2019 18:06:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r347935 - head/sys/security/mac_veriexec X-SVN-Group: head X-SVN-Commit-Author: stevek X-SVN-Commit-Paths: head/sys/security/mac_veriexec X-SVN-Commit-Revision: 347935 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8E0AE864C0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2019 18:06:26 -0000 Author: stevek Date: Fri May 17 18:06:24 2019 New Revision: 347935 URL: https://svnweb.freebsd.org/changeset/base/347935 Log: Fix format strings for some debug messages that could have arguments that are different types across architectures by using %ju and typecasting to uintmax_t, where appropriate. Obtained from: Juniper Networks, Inc. MFC after: 1 week Modified: head/sys/security/mac_veriexec/mac_veriexec.c Modified: head/sys/security/mac_veriexec/mac_veriexec.c ============================================================================== --- head/sys/security/mac_veriexec/mac_veriexec.c Fri May 17 18:02:26 2019 (r347934) +++ head/sys/security/mac_veriexec/mac_veriexec.c Fri May 17 18:06:24 2019 (r347935) @@ -193,7 +193,8 @@ mac_veriexec_vfs_mounted(void *arg __unused, struct mo SLOT_SET(mp->mnt_label, va.va_fsid); #ifdef MAC_DEBUG - MAC_VERIEXEC_DBG(3, "set fsid to %u for mount %p", va.va_fsid, mp); + MAC_VERIEXEC_DBG(3, "set fsid to %ju for mount %p", + (uintmax_t)va.va_fsid, mp); #endif } @@ -216,7 +217,8 @@ mac_veriexec_vfs_unmounted(void *arg __unused, struct fsid = SLOT(mp->mnt_label); if (fsid) { - MAC_VERIEXEC_DBG(3, "fsid %u, cleaning up mount", fsid); + MAC_VERIEXEC_DBG(3, "fsid %ju, cleaning up mount", + (uintmax_t)fsid); mac_veriexec_metadata_unmounted(fsid, td); } } @@ -379,9 +381,9 @@ mac_veriexec_kld_check_load(struct ucred *cred, struct * kldload should fail unless there is a valid fingerprint * registered. */ - MAC_VERIEXEC_DBG(2, "fingerprint status is %d for dev %u, " - "file %lu.%lu\n", status, va.va_fsid, va.va_fileid, - va.va_gen); + MAC_VERIEXEC_DBG(2, "fingerprint status is %d for dev %ju, " + "file %ju.%ju\n", status, (uintmax_t)va.va_fsid, + (uintmax_t)va.va_fileid, (uintmax_t)va.va_gen); return (EAUTH); } @@ -492,8 +494,8 @@ mac_veriexec_check_vp(struct ucred *cred, struct vnode case FINGERPRINT_INDIRECT: MAC_VERIEXEC_DBG(2, "attempted write to fingerprinted file for dev " - "%u, file %lu.%lu\n", va.va_fsid, - va.va_fileid, va.va_gen); + "%ju, file %ju.%ju\n", (uintmax_t)va.va_fsid, + (uintmax_t)va.va_fileid, (uintmax_t)va.va_gen); return (EPERM); default: break; @@ -513,8 +515,9 @@ mac_veriexec_check_vp(struct ucred *cred, struct vnode * fingerprint registered. */ MAC_VERIEXEC_DBG(2, "fingerprint status is %d for dev " - "%u, file %lu.%lu\n", status, va.va_fsid, - va.va_fileid, va.va_gen); + "%ju, file %ju.%ju\n", status, + (uintmax_t)va.va_fsid, (uintmax_t)va.va_fileid, + (uintmax_t)va.va_gen); return (EAUTH); } }