From patchwork Wed May 10 18:02:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9720387 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 EED1260365 for ; Wed, 10 May 2017 18:04:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EB4E26E78 for ; Wed, 10 May 2017 18:04:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 136C528617; Wed, 10 May 2017 18:04:29 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 8B5B126E78 for ; Wed, 10 May 2017 18:04:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754487AbdEJSEN (ORCPT ); Wed, 10 May 2017 14:04:13 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:46075 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754277AbdEJSC4 (ORCPT ); Wed, 10 May 2017 14:02:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=d8470F5k1J9WYl87QXY7ghuO2oN+odZOQqGK/SIHPLY=; b=fp72X8/uMUuB/Fws/RXphgjgd iRQlLXzYI4yU0S2+tJkuRuAlO2LUjIJC04IgLqijYV1pBOpQZHk9WtI9fHXf2WcWQHkfW7EHlN6bp A8J0vAW5cTbRvhf728zVItiMMmd5WCe3PQmUmpB02K6Q1nGmwhL1l5MthzQsvTgY/GlNo2WdVgwjS jHg9uHyWE3qkWRIswAX5WycPgJ7t4T4JSwPZj7Y9t+kpt2LHC38oaJtwsB9NTnkVc8qz8D4gTYGL8 2+YSph7CIIghiLb3V2+1S3I61SFADT621kd0AaCduAeCUCOai8bUlqFzZ7m26SN9wYDvthMp2UfWS ivsBMQ1UA==; Received: from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1d8Vwt-0005MF-2k; Wed, 10 May 2017 18:02:56 +0000 From: Christoph Hellwig To: Andy Shevchenko , Amir Goldstein , linux-fsdevel@vger.kernel.org Cc: Shaohua Li , Dan Williams , David Howells , Steven Whitehouse , Mimi Zohar , linux-xfs@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org Subject: [PATCH 14/16] block: remove blk_part_pack_uuid Date: Wed, 10 May 2017 20:02:12 +0200 Message-Id: <20170510180214.16852-15-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170510180214.16852-1-hch@lst.de> References: <20170510180214.16852-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This helper was only used by IMA of all things, which would get spurious errors if CONFIG_BLOCK is disabled. Just opencode the call there. Signed-off-by: Christoph Hellwig [andy: correctly handle error returns from uuid_to_bin] 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 4d1178610145..49fbc3e8f012 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -717,8 +717,9 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) break; } - uuid_to_bin(args[0].from, (uuid_t *)entry->fsuuid); - entry->flags |= IMA_FSUUID; + result = uuid_to_bin(args[0].from, (uuid_t *)&entry->fsuuid); + if (!result) + entry->flags |= IMA_FSUUID; break; case Opt_uid_gt: case Opt_euid_gt: