From patchwork Tue Jun 20 20:46:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 106025 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp1507690obh; Tue, 20 Jun 2017 13:47:52 -0700 (PDT) X-Received: by 10.84.210.40 with SMTP id z37mr12538677plh.265.1497991671974; Tue, 20 Jun 2017 13:47:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497991671; cv=none; d=google.com; s=arc-20160816; b=jiHEDBXovG8V18poo9Yy+HyCapvBZtVrXksb1FTphxjlb/HsZAF1/IZeRooDx0P4JM ysN8c15jVqoSSPa5imw8QdfiOJFUIaZu4GVn9PzUlvQgyGk6LIYbUFYQcOTIAy0KikdV XGIlps+kZzHQUgY3y2kQtFPRBFldMclueZ/48wOBQgJZ5q4GvlBAMLpgjZ2NVKfhCmiU AV6LXx1mqxFxOOr8MI48MoyPunU0pNUNLD3MBkHUhjhqJn2+ixoLWa0F//vXLFm/MyA8 XpIaOFUk7NQ2MjMu2DCmyjq3/Y2TtmxpFSt7tfQ/DNa4wJHVGvHTNrIGVV6iI3PBrUiv LaYQ== 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=esdUYp4AyWIF3akt7r3ygPmus0uERKLy/RE69BL+rrg=; b=EoxSNTMauZOxvcVZR9cgoeu53Y81jKEHjOIug25buzYXusxpcKCWRTLa4fPxkIQ+1I 6pnyRlk8mbGIDnH1VeZaZlV1iB1FTx+uk4os2MOyw9SkrS3Ddl/pf3OKaiQ7kl0boDHi Ys0rM5dtT8eyLer/6g7C/3Lh/rj4JowrfwiZ/6BTOZ2MMRMuAf9sVuL+4W7bZsbx5Lx1 1qwbf2lLZAAT0Ap9spedWq6KUTmmTFFMT1EI12Mk7YsX5FTYEXKZdsLJcYeYjdvHhr5V Qwe8uyqLlTQ7q69sT9zkJl3DBO9aDdRZhD2TlE4mu613ZINAdVIy7jwTshVFthPtvXdf ntdg== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g5si8526390plm.221.2017.06.20.13.47.51; Tue, 20 Jun 2017 13:47:51 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752402AbdFTUrd (ORCPT + 25 others); Tue, 20 Jun 2017 16:47:33 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:57371 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751041AbdFTUrb (ORCPT ); Tue, 20 Jun 2017 16:47:31 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0Md090-1d6RP40s1i-00IDVy; Tue, 20 Jun 2017 22:47:24 +0200 From: Arnd Bergmann To: John Johansen Cc: Arnd Bergmann , James Morris , "Serge E. Hallyn" , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] apparmor: add braces around optional statement Date: Tue, 20 Jun 2017 22:46:19 +0200 Message-Id: <20170620204722.910610-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:SRfAlKnFl5snvcyYtuGbvLIvVv7yLl+pzuUo2ACf3g56tDwis4z 6OffE+u75i8YNLltKuQf7Os/IjxLs+viqn1i+tKZRUsOO3mEotWDAiMiqFNQGyNJ+xCnnyz VVlMSJ1AoKebbTFJPQBRZ+ER7GISKUEDjm1vsCRWCKJFJ3Q5ye4gPXD0sBmZFLpFCOGXc/s Gndj4VhBzr3vvUx05mPZQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:wvMi7dv1jDM=:tY0dwiJ0yQZgdfp8yl9ziy ausQYwm0yn6IwXArWDbO8HYPmMsDsFqeg+WsZUY7yieZ2OyBBeE0KR9NJBU7Zo5f8AAQPTlI2 WKvpG/IFrNbi0+fpDGHXsMs7XXqly03JsqbfNqqaxbFgtM9qD4zEnDjBN0q6AZDxdfEpMkrBw v1pUlfsG2XN/m5+Cmdf2FTVba9dNAHLj3KX2/RE0SemeFUoFYko7qqiY27GbLhexs9c+1Se+Z UN9pcWIClGfn3VmrgEi3DXRV0nEhQJwSeKhX2yErMHdk9Gv/c12jjo3QTJpqG/gZ+wfqfhk0g 736C2EJP/zrCEGwT6ufrsjV+SImJ52t588jjU93tTQvXU47YaN3GwL8j5UXQXC1yyGxLjYAYw 5P984KnuaHj+7Us9hmfwPtArO6+OLrU9RBk7dnauK7YDX7ba2R0ArdBxtTu4L2DpaUrILYITk VAm9cSXMQWzSt5vCn5FqtUAKA4tsgMOHGOndtq1Hdj3UmUUSmIrxlc+pKlT0zWiOQb50Z21UG JRq9bafNKwtOJy4ZpywEC+bmU57eVHaPjqlrTGR9Dgm4dIqWQRyyVLAbrFhz17Qo8YgsTfAod j2M0te7UdLpd2v01ZzBXIrQUWoPVvwzEDDQzI7lRK95sjplG1htySo+D9n+n/bRnAHDD3DWQM vhEuaTnsOUZSlNsEy6LVZBJyefaxn/xtyde00cAzycL7kRdlbn4DMqUvV7F5Axm+LOaI= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We get a warning when AA_BUG() compiles to an nothing: security/apparmor/label.c: In function '__label_update': security/apparmor/label.c:2055:3: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body] There are two things we can do about this: - add the missing braces in the call site, which also brings the code in line with the regular Linux coding style - redefine the macro so it is not empty but instead uses no_printk() in AA_BUG_FMT() to perform format checking. Both seem like good ideas, so this does both at once. Fixes: f1bd904175e8 ("apparmor: add the base fns() for domain labels") Signed-off-by: Arnd Bergmann -- v2: actually include the second part of the patch --- security/apparmor/include/lib.h | 2 +- security/apparmor/label.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.9.0 Acked-by: Serge Hallyn Acked-by: John Johansen diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h index 436b3a722357..cbfb71c1ec88 100644 --- a/security/apparmor/include/lib.h +++ b/security/apparmor/include/lib.h @@ -50,7 +50,7 @@ #define AA_BUG_FMT(X, fmt, args...) \ WARN((X), "AppArmor WARN %s: (" #X "): " fmt, __func__, ##args) #else -#define AA_BUG_FMT(X, fmt, args...) +#define AA_BUG_FMT(X, fmt, args...) no_printk("%s" fmt, __func__, ##args) #endif #define AA_ERROR(fmt, args...) \ diff --git a/security/apparmor/label.c b/security/apparmor/label.c index e052eaba1cf6..f8e08d94a8a6 100644 --- a/security/apparmor/label.c +++ b/security/apparmor/label.c @@ -2051,8 +2051,9 @@ static struct aa_label *__label_update(struct aa_label *label) write_lock_irqsave(&ls->lock, flags); goto remove; } - } else + } else { AA_BUG(labels_ns(label) != labels_ns(new)); + } tmp = __label_insert(labels_set(label), new, true); remove: