From patchwork Wed May 10 15:56:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 9720117 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3F8EF60236 for ; Wed, 10 May 2017 15:56:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3251528618 for ; Wed, 10 May 2017 15:56:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26E3928622; Wed, 10 May 2017 15:56:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C910128618 for ; Wed, 10 May 2017 15:56:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753899AbdEJP4S (ORCPT ); Wed, 10 May 2017 11:56:18 -0400 Received: from mga06.intel.com ([134.134.136.31]:25019 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753860AbdEJP4R (ORCPT ); Wed, 10 May 2017 11:56:17 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP; 10 May 2017 08:56:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,320,1491289200"; d="scan'208";a="1128664024" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 10 May 2017 08:56:14 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id CDD5B16B; Wed, 10 May 2017 18:56:13 +0300 (EEST) From: Andy Shevchenko To: Christoph Hellwig , Amir Goldstein , linux-xfs , Dan Williams , linux-fsdevel Cc: Andy Shevchenko Subject: [PATCH v1 3/3] (to be folded into): block: remove blk_part_pack_uuid Date: Wed, 10 May 2017 18:56:12 +0300 Message-Id: <20170510155612.55870-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170510155612.55870-1-andriy.shevchenko@linux.intel.com> References: <20170510155612.55870-1-andriy.shevchenko@linux.intel.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Andy Shevchenko --- security/integrity/ima/ima_policy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 626a26d98ffd..659dbcc83d2f 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -716,8 +716,9 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) break; } - uuid_to_bin(args[0].from, &entry->fsuuid); - entry->flags |= IMA_FSUUID; + result = uuid_to_bin(args[0].from, &entry->fsuuid); + if (!result) + entry->flags |= IMA_FSUUID; break; case Opt_uid_gt: case Opt_euid_gt: