From 1a88d09a37a72d9e9582b682d23fd0e76de9553c Mon Sep 17 00:00:00 2001 From: Shawn Webb Date: Mon, 27 Jan 2020 09:25:50 -0500 Subject: [PATCH] HBSD: Disable cfi-icall for the various Kerberos executables When I get time, I'll figure out why cfi-icall is broken for the various Kerberos executables. Signed-off-by: Shawn Webb MFC-to: 12-STABLE --- kerberos5/libexec/digest-service/Makefile | 2 ++ kerberos5/libexec/hprop/Makefile | 2 ++ kerberos5/libexec/hpropd/Makefile | 2 ++ kerberos5/libexec/ipropd-master/Makefile | 2 ++ kerberos5/libexec/ipropd-slave/Makefile | 2 ++ kerberos5/libexec/kadmind/Makefile | 2 ++ kerberos5/libexec/kcm/Makefile | 2 ++ kerberos5/libexec/kdc/Makefile | 2 ++ kerberos5/libexec/kdigest/Makefile | 2 ++ kerberos5/libexec/kfd/Makefile | 2 ++ kerberos5/libexec/kimpersonate/Makefile | 2 ++ kerberos5/libexec/kpasswdd/Makefile | 2 ++ kerberos5/usr.bin/hxtool/Makefile | 2 ++ kerberos5/usr.bin/kadmin/Makefile | 2 ++ kerberos5/usr.bin/kcc/Makefile | 2 ++ kerberos5/usr.bin/kdestroy/Makefile | 2 ++ kerberos5/usr.bin/kf/Makefile | 2 ++ kerberos5/usr.bin/kgetcred/Makefile | 2 ++ kerberos5/usr.bin/kinit/Makefile | 2 ++ kerberos5/usr.bin/kpasswd/Makefile | 2 ++ kerberos5/usr.bin/ksu/Makefile | 2 ++ kerberos5/usr.bin/string2key/Makefile | 2 ++ kerberos5/usr.bin/verify_krb5_conf/Makefile | 2 ++ kerberos5/usr.sbin/iprop-log/Makefile | 2 ++ kerberos5/usr.sbin/kstash/Makefile | 2 ++ kerberos5/usr.sbin/ktutil/Makefile | 2 ++ 26 files changed, 52 insertions(+) diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile index 7b888f5481cd..3d07f3d41130 100644 --- a/kerberos5/libexec/digest-service/Makefile +++ b/kerberos5/libexec/digest-service/Makefile @@ -12,6 +12,8 @@ CFLAGS+= -I${KRB5DIR}/kdc \ LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm LDFLAGS=${LDAPLDFLAGS} +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/kdc diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile index 1c5d4b20e1bf..4965b3dd1341 100644 --- a/kerberos5/libexec/hprop/Makefile +++ b/kerberos5/libexec/hprop/Makefile @@ -16,6 +16,8 @@ DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/kdc diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile index 56a598f08312..c24c7c942775 100644 --- a/kerberos5/libexec/hpropd/Makefile +++ b/kerberos5/libexec/hpropd/Makefile @@ -9,6 +9,8 @@ DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/kdc diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index 9f0bddbae4fd..b0506b2cf63a 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -10,6 +10,8 @@ DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/lib/kadm5 diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index cae84aa5ffb5..ed24a1d4cdde 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -10,6 +10,8 @@ DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/lib/kadm5 diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index b2f3f71cc1e8..d99ee4cbcaea 100644 --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -7,6 +7,8 @@ SRCS= rpc.c \ kadmind.c \ kadm_conn.c +CFI_OVERRIDE= -fno-sanitize=cfi-icall + CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS} LIBADD= kadm5srv gssapi hdb krb5 roken vers diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile index fa7a0cfce9cf..617c7b3fcb64 100644 --- a/kerberos5/libexec/kcm/Makefile +++ b/kerberos5/libexec/kcm/Makefile @@ -17,6 +17,8 @@ SRCS= acl.c \ sessions.c \ renew.c +CFI_OVERRIDE= -fno-sanitize=cfi-icall + CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS} LIBADD= krb5 roken heimntlm heimipcs crypto diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index 338a508de20b..4c6d0d8bcd77 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -8,6 +8,8 @@ SRCS= config.c \ announce.c \ main.c +CFI_OVERRIDE= -fno-sanitize=cfi-icall + CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS} LIBADD= kdc hdb krb5 roken crypt vers diff --git a/kerberos5/libexec/kdigest/Makefile b/kerberos5/libexec/kdigest/Makefile index 5f3fb2450646..688a26ec1f25 100644 --- a/kerberos5/libexec/kdigest/Makefile +++ b/kerberos5/libexec/kdigest/Makefile @@ -10,6 +10,8 @@ SRCS= kdigest.c \ kdigest-commands.c \ kdigest-commands.h +CFI_OVERRIDE= -fno-sanitize=cfi-icall + CLEANFILES= kdigest-commands.h kdigest-commands.c kdigest-commands.h: kdigest-commands.in diff --git a/kerberos5/libexec/kfd/Makefile b/kerberos5/libexec/kfd/Makefile index 82df3adbb6da..cecb2fb77285 100644 --- a/kerberos5/libexec/kfd/Makefile +++ b/kerberos5/libexec/kfd/Makefile @@ -6,6 +6,8 @@ CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken LIBADD= krb5 roken vers +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/appl/kf diff --git a/kerberos5/libexec/kimpersonate/Makefile b/kerberos5/libexec/kimpersonate/Makefile index 3c94db6857d0..46afc3e01a7a 100644 --- a/kerberos5/libexec/kimpersonate/Makefile +++ b/kerberos5/libexec/kimpersonate/Makefile @@ -8,6 +8,8 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/sl -I. LIBADD= krb5 roken asn1 vers +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/kuser diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile index ec36c24fc034..eb21037b62f1 100644 --- a/kerberos5/libexec/kpasswdd/Makefile +++ b/kerberos5/libexec/kpasswdd/Makefile @@ -8,6 +8,8 @@ DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/kpasswd diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile index 7cec9ee729b1..b54cb82c7266 100644 --- a/kerberos5/usr.bin/hxtool/Makefile +++ b/kerberos5/usr.bin/hxtool/Makefile @@ -11,6 +11,8 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ LIBADD= hx509 roken asn1 crypto sl vers edit SRCS= hxtool.c hxtool-commands.c hxtool-commands.h +CFI_OVERRIDE= -fno-sanitize=cfi-icall + CLEANFILES= hxtool-commands.h hxtool-commands.c hxtool-commands.h: hxtool-commands.in diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index 729b9f7f418e..2eb69b551215 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -24,6 +24,8 @@ SRCS= add_enctype.c \ stash.c \ util.c +CFI_OVERRIDE= -fno-sanitize=cfi-icall + CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I${SRCTOP}/contrib/com_err -I. ${LDAPCFLAGS} LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit diff --git a/kerberos5/usr.bin/kcc/Makefile b/kerberos5/usr.bin/kcc/Makefile index 7c4b7ab3962a..135a89012b01 100644 --- a/kerberos5/usr.bin/kcc/Makefile +++ b/kerberos5/usr.bin/kcc/Makefile @@ -16,6 +16,8 @@ SRCS= kcc.c \ kswitch.c \ copy_cred_cache.c +CFI_OVERRIDE= -fno-sanitize=cfi-icall + CLEANFILES= kcc-commands.h kcc-commands.c kcc-commands.h: kcc-commands.in diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile index 23e90237c658..be67e2c1b9d4 100644 --- a/kerberos5/usr.bin/kdestroy/Makefile +++ b/kerberos5/usr.bin/kdestroy/Makefile @@ -5,6 +5,8 @@ CFLAGS+=-I${KRB5DIR}/lib/roken LIBADD= kafs5 krb5 roken vers MAN= kdestroy.1 +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/kuser diff --git a/kerberos5/usr.bin/kf/Makefile b/kerberos5/usr.bin/kf/Makefile index 44d91830baaf..39fb9519bc01 100644 --- a/kerberos5/usr.bin/kf/Makefile +++ b/kerberos5/usr.bin/kf/Makefile @@ -6,6 +6,8 @@ CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken LIBADD= krb5 roken vers +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/appl/kf diff --git a/kerberos5/usr.bin/kgetcred/Makefile b/kerberos5/usr.bin/kgetcred/Makefile index 1451154f9cf8..645d150e6de2 100644 --- a/kerberos5/usr.bin/kgetcred/Makefile +++ b/kerberos5/usr.bin/kgetcred/Makefile @@ -5,6 +5,8 @@ CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken LIBADD= krb5 roken asn1 vers +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/kuser diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile index 7622b8da956e..f0e7f4ac0aa1 100644 --- a/kerberos5/usr.bin/kinit/Makefile +++ b/kerberos5/usr.bin/kinit/Makefile @@ -4,6 +4,8 @@ PROG= kinit CFLAGS+=-I${KRB5DIR}/lib/roken LIBADD= kafs5 krb5 heimntlm roken crypto vers +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/kuser diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile index 05e07dddc03d..709af79d36c3 100644 --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -5,6 +5,8 @@ CFLAGS+=-I${KRB5DIR}/lib/roken LIBADD= hdb krb5 roken vers crypto LDFLAGS=${LDAPLDFLAGS} +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/kpasswd diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile index ebd39c677b54..afd14bf1b00a 100644 --- a/kerberos5/usr.bin/ksu/Makefile +++ b/kerberos5/usr.bin/ksu/Makefile @@ -10,6 +10,8 @@ SRCS= su.c CFLAGS+=-I${KRB5DIR}/lib/roken LIBADD= kafs5 krb5 roken vers crypto crypt +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/appl/su diff --git a/kerberos5/usr.bin/string2key/Makefile b/kerberos5/usr.bin/string2key/Makefile index 129d12cbcf0d..50aac077edf4 100644 --- a/kerberos5/usr.bin/string2key/Makefile +++ b/kerberos5/usr.bin/string2key/Makefile @@ -10,6 +10,8 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${SRCTOP}/contrib/com_err LIBADD= krb5 roken crypto vers +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/kdc diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile index 372870c1ecc9..dba890add8be 100644 --- a/kerberos5/usr.bin/verify_krb5_conf/Makefile +++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile @@ -6,6 +6,8 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ -I${SRCTOP}/contrib/com_err LIBADD= krb5 roken vers +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/lib/krb5 diff --git a/kerberos5/usr.sbin/iprop-log/Makefile b/kerberos5/usr.sbin/iprop-log/Makefile index 1f71f9b2a400..9caad47475f9 100644 --- a/kerberos5/usr.sbin/iprop-log/Makefile +++ b/kerberos5/usr.sbin/iprop-log/Makefile @@ -11,6 +11,8 @@ CFLAGS+= -I${KRB5DIR}/lib/kadm5 \ LIBADD= kadm5srv hdb krb5 roken edit sl vers LDFLAGS=${LDAPLDFLAGS} +CFI_OVERRIDE= -fno-sanitize=cfi-icall + CLEANFILES= iprop-commands.h iprop-commands.c iprop-commands.h: iprop-commands.in diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index 1eec313766d3..604e82f1347e 100644 --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -9,6 +9,8 @@ DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} +CFI_OVERRIDE= -fno-sanitize=cfi-icall + .include .PATH: ${KRB5DIR}/kdc diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index c79d09e6d94d..e4034e2ade54 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -16,6 +16,8 @@ SRCS= add.c \ remove.c \ rename.c +CFI_OVERRIDE= -fno-sanitize=cfi-icall + CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I. LIBADD= kadm5clnt krb5 roken crypto edit sl vers