From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757303Ab3BVVTu (ORCPT ); Fri, 22 Feb 2013 16:19:50 -0500 Received: from casper.infradead.org ([85.118.1.10]:52024 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756677Ab3BVVTt (ORCPT ); Fri, 22 Feb 2013 16:19:49 -0500 Message-ID: <5127E111.6030605@infradead.org> Date: Fri, 22 Feb 2013 13:20:17 -0800 From: Randy Dunlap User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130105 Thunderbird/17.0.2 MIME-Version: 1.0 To: Mimi Zohar CC: David Rientjes , James Morris , linux-security-module , linux-kernel , linux-next , Dmitry Kasatkin Subject: Re: [PATCH] ima: fix part_pack_uuid() build error References: <1361562413.2908.22.camel@falcor1.watson.ibm.com> In-Reply-To: <1361562413.2908.22.camel@falcor1.watson.ibm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/22/13 11:46, Mimi Zohar wrote: > Fix a build error when CONFIG_BLOCK is not enabled by defining > a wrapper called ima_part_pack_uuid(). The wrapper returns > -EINVAL, when CONFIG_BLOCK is not defined. Some function wrapper for the case of BLOCK not enabled should be handled where the function is defined, not where it is called. That's how it is usually done in Linux. > security/integrity/ima/ima_policy.c:538:4: error: implicit declaration > of function 'part_pack_uuid' [-Werror=implicit-function-declaration] > > Changelog v0: > - fix UUID scripts/Lindent msgs > > Reported-by: Randy Dunlap > Reported-by: David Rientjes > Signed-off-by: Mimi Zohar > --- > security/integrity/ima/ima.h | 13 +++++++++++++ > security/integrity/ima/ima_policy.c | 11 ++++++----- > 2 files changed, 19 insertions(+), 5 deletions(-) > > diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h > index a41c9c1..902c356 100644 > --- a/security/integrity/ima/ima.h > +++ b/security/integrity/ima/ima.h > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -199,4 +200,16 @@ static inline int security_filter_rule_match(u32 secid, u32 field, u32 op, > return -EINVAL; > } > #endif /* CONFIG_IMA_LSM_RULES */ > + > +/* UUID policy option requires CONFIG_BLOCK */ > +#ifdef CONFIG_BLOCK > +static inline int ima_part_pack_uuid(const u8 *uuid_str, u8 *to) { > + part_pack_uuid(uuid_str, to); > + return 0; > +} > +#else > +static inline int ima_part_pack_uuid(const u8 *uuid_str, u8 *to) { > + return -EINVAL; > +} > +#endif > #endif > diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c > index b27535a..41b7f48 100644 > --- a/security/integrity/ima/ima_policy.c > +++ b/security/integrity/ima/ima_policy.c > @@ -176,7 +176,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, > && rule->fsmagic != inode->i_sb->s_magic) > return false; > if ((rule->flags & IMA_FSUUID) && > - memcmp(rule->fsuuid, inode->i_sb->s_uuid, sizeof(rule->fsuuid))) > + memcmp(rule->fsuuid, inode->i_sb->s_uuid, sizeof(rule->fsuuid))) > return false; > if ((rule->flags & IMA_UID) && !uid_eq(rule->uid, cred->uid)) > return false; > @@ -530,14 +530,15 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) > ima_log_string(ab, "fsuuid", args[0].from); > > if (memchr_inv(entry->fsuuid, 0x00, > - sizeof(entry->fsuuid))) { > + sizeof(entry->fsuuid))) { > result = -EINVAL; > break; > } > > - part_pack_uuid(args[0].from, entry->fsuuid); > - entry->flags |= IMA_FSUUID; > - result = 0; > + result = ima_part_pack_uuid(args[0].from, > + entry->fsuuid); > + if (!result) > + entry->flags |= IMA_FSUUID; > break; > case Opt_uid: > ima_log_string(ab, "uid", args[0].from); > -- ~Randy