From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965242AbcAUNWz (ORCPT ); Thu, 21 Jan 2016 08:22:55 -0500 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:39804 "EHLO e23smtp05.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965107AbcAUNWv (ORCPT ); Thu, 21 Jan 2016 08:22:51 -0500 X-IBM-Helo: d23dlp02.au.ibm.com X-IBM-MailFrom: zohar@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org;linux-security-module@vger.kernel.org Message-ID: <1453382511.9549.140.camel@linux.vnet.ibm.com> Subject: Re: [PATCH] IMA: fix non-ANSI declaration of ima_check_policy() From: Mimi Zohar To: Colin King Cc: Dmitry Kasatkin , James Morris , "Serge E . Hallyn" , linux-ima-devel@lists.sourceforge.net, linux-ima-user@lists.sourceforge.net, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Date: Thu, 21 Jan 2016 08:21:51 -0500 In-Reply-To: <1453288426-4011-1-git-send-email-colin.king@canonical.com> References: <1453288426-4011-1-git-send-email-colin.king@canonical.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.11 (3.12.11-1.fc21) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16012113-0017-0000-0000-000002A11F1E Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2016-01-20 at 11:13 +0000, Colin King wrote: > From: Colin Ian King > > ima_check_policy() has no parameters, so use the normal void > parameter convention to make it match the prototype in the header file > security/integrity/ima/ima.h > > Signed-off-by: Colin Ian King Thank you. Mimi > --- > security/integrity/ima/ima_policy.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c > index 0a3b781..e0e18cc 100644 > --- a/security/integrity/ima/ima_policy.c > +++ b/security/integrity/ima/ima_policy.c > @@ -417,7 +417,7 @@ void __init ima_init_policy(void) > } > > /* Make sure we have a valid policy, at least containing some rules. */ > -int ima_check_policy() > +int ima_check_policy(void) > { > if (list_empty(&ima_temp_rules)) > return -EINVAL;