Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp1025327imm; Tue, 3 Jul 2018 04:20:20 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeYMo4Dlm2nYVqyV31+/UG5LpINFMVr7IU8ITjRQHx5nQrXYXr9SBXH1gU1MwWem9KGw8o4 X-Received: by 2002:a63:6fcc:: with SMTP id k195-v6mr22606257pgc.135.1530616820690; Tue, 03 Jul 2018 04:20:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530616820; cv=none; d=google.com; s=arc-20160816; b=O86NnSzb0j876NIT8vRVyK6KahrIasMCPINT8IxpLGPfhb/bkVEmiplbs4Plc0b00r Avi7egOU4blJbndhXX3JZyLHMrjWgpDDgnVyr8qV+tWxjFI/lpKDoh+JKxNGPoyQfspu HbvJmpiBV+sfLJEFbNRJsl7rkFs7Y8w71NgGkNRZnZBbw9wojIKkpTXFxWSUguigGu3k C5KRSHX6adcmTR7WP7uNDfhLvgnArWa8mtEvlF5PFj0pLmj9nx8kjPi8Fb7SPwLzK4tb uZ7QJ5rasfhG8Ftws52DJYDZZGmsnMun8l+qqvNtK3TqlEmG299Ba8D5C1Pz+8A9Qp2u XJNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=IhWGnPPurtPnwidZp652bRxgY8dhUiKze6+kOvHzVHk=; b=j/BMoi3m7q1WDtLgcfdTzJLQIE/fTKACkdcJXFZNX1EelddpIL1mDUiXYRG3O8kVe8 13q09pEWQTSH4BQrKP+1va1C0yj8g1LBY+sPVU/WR/4xMDhPR8LJbb7Z+6JjKPBgB3Ci Gt2LBgs3QchP3S/DF3a2MLKdB8DQt5lqa+SX9cyhTICDEg7QdZ/loaT/MK5x/FrnGucw Du4HY1b3dPBAu43WG13r0GSQcOpNTBqeReYCY3ibBnYv5I8w8p+SkVy65uVc+dOzy5hH AHMl/xcw/oco7YxM/pU0kihNvDgms2KkIlc33fDhR0aQtkrfJiz5gk/ngry040uDYKIh cWeA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 15-v6si896098pfk.287.2018.07.03.04.20.05; Tue, 03 Jul 2018 04:20:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752964AbeGCLT3 (ORCPT + 99 others); Tue, 3 Jul 2018 07:19:29 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:35580 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752554AbeGCLT1 (ORCPT ); Tue, 3 Jul 2018 07:19:27 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w63BIWbb133091 for ; Tue, 3 Jul 2018 07:19:27 -0400 Received: from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151]) by mx0a-001b2d01.pphosted.com with ESMTP id 2k0667571f-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 03 Jul 2018 07:19:27 -0400 Received: from localhost by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 3 Jul 2018 05:19:26 -0600 Received: from b03cxnp08028.gho.boulder.ibm.com (9.17.130.20) by e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 3 Jul 2018 05:19:23 -0600 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w63BJMGj11862508 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 3 Jul 2018 04:19:22 -0700 Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9069D7805C; Tue, 3 Jul 2018 05:19:22 -0600 (MDT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1C9657805F; Tue, 3 Jul 2018 05:19:22 -0600 (MDT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Tue, 3 Jul 2018 05:19:21 -0600 (MDT) From: Stefan Berger To: linux-integrity@vger.kernel.org, jarkko.sakkinen@linux.intel.com, zohar@linux.vnet.ibm.com Cc: jgg@ziepe.ca, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, Stefan Berger Subject: [PATCH] ima: Remove unused is_ima_appraise_enabled() function. Date: Tue, 3 Jul 2018 07:19:17 -0400 X-Mailer: git-send-email 2.14.4 X-TM-AS-GCONF: 00 x-cbid: 18070311-0036-0000-0000-00000A0A3D9E X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009300; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000266; SDB=6.01055912; UDB=6.00541614; IPR=6.00833834; MB=3.00021975; MTD=3.00000008; XFM=3.00000015; UTC=2018-07-03 11:19:25 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18070311-0037-0000-0000-000047F7FB41 Message-Id: <20180703111917.3265212-1-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-07-03_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807030131 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove the unused is_ima_appraise_enabled() function. Signed-off-by: Stefan Berger --- include/linux/ima.h | 6 ------ security/integrity/ima/ima_appraise.c | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/include/linux/ima.h b/include/linux/ima.h index 0e4647e0eb60..7f6952f8d6aa 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h @@ -75,17 +75,11 @@ static inline void ima_add_kexec_buffer(struct kimage *image) #endif #ifdef CONFIG_IMA_APPRAISE -extern bool is_ima_appraise_enabled(void); extern void ima_inode_post_setattr(struct dentry *dentry); extern int ima_inode_setxattr(struct dentry *dentry, const char *xattr_name, const void *xattr_value, size_t xattr_value_len); extern int ima_inode_removexattr(struct dentry *dentry, const char *xattr_name); #else -static inline bool is_ima_appraise_enabled(void) -{ - return 0; -} - static inline void ima_inode_post_setattr(struct dentry *dentry) { return; diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c index 8bd7a0733e51..7bf7fcacfdbb 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c @@ -33,16 +33,6 @@ static int __init default_appraise_setup(char *str) __setup("ima_appraise=", default_appraise_setup); -/* - * is_ima_appraise_enabled - return appraise status - * - * Only return enabled, if not in ima_appraise="fix" or "log" modes. - */ -bool is_ima_appraise_enabled(void) -{ - return ima_appraise & IMA_APPRAISE_ENFORCE; -} - /* * ima_must_appraise - set appraise flag * -- 2.17.1