From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2F1FC3A5A0 for ; Mon, 19 Aug 2019 23:41:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C257B22CF5 for ; Mon, 19 Aug 2019 23:41:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="OLeyKdbp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728846AbfHSXlf (ORCPT ); Mon, 19 Aug 2019 19:41:35 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:36337 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728784AbfHSXlX (ORCPT ); Mon, 19 Aug 2019 19:41:23 -0400 Received: by mail-pl1-f195.google.com with SMTP id f19so1318379plr.3 for ; Mon, 19 Aug 2019 16:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xnYZ9Q3Ni03lDY+Gxs06Jnj2bjWxdv8h8dY+YQg9wa8=; b=OLeyKdbpNpyYPM9XgjdRAnfM1bSv+5+iCu31H3+NiWlknEdtqHRCq0QvE55tojq6k6 kcaGLIU/ljCeqdinyfIg01iman04q3p3hc/6hKNXg6vlDOaoTpzusAkYrVetkbdsHLAK dxsabGt3kImG4h/7oXRad4gS80TGmNKo+ew4U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xnYZ9Q3Ni03lDY+Gxs06Jnj2bjWxdv8h8dY+YQg9wa8=; b=NyfKoEZxDRGkWvuUuXB/1+LyUI1XOf3E8lQOSWSA960nDNM5xzD6R39lzKkDa8fIy6 FAuYr8lg8IACLDhR/gEeNlP4pQjGGxg/YBGv28FgTVuU/uDZ6/P7SJjAonipZYIa2cyC UIEnGqC+M76msFRV8d36C7Ef4fpMMAbpwuV3cs0q55NjLzVzgpMl7MpKd5n27m4JpoY8 mmWCAdpyPZhDUF/nXfqiALXzXavPpdIIZSdx0TBfGoYtZFo1satPUxivOv9E2v/i0b8t IbQKRAIG98hq/xk7oUPOcyfuRkJK30H1t9N1uf0BIiJO1SsGaqTYqznMPyS/KqZ55Sz8 M8Jg== X-Gm-Message-State: APjAAAUR7QL8fd9CjjY0q03nVuJ+KhNmKCvR2PNaxHycEP+3WI7iH6BD +YS+Iz4iJKwrzlR1m1/rKC5ukw== X-Google-Smtp-Source: APXvYqzibdVDCRWGdmB6uAvlJwHae1zxguoC1fNttlOxomsizUsBxLKEnrgWQDuAiL0Gbk7j5a9VWw== X-Received: by 2002:a17:902:e68f:: with SMTP id cn15mr5738213plb.212.1566258082196; Mon, 19 Aug 2019 16:41:22 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id k6sm16830888pfi.12.2019.08.19.16.41.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Aug 2019 16:41:20 -0700 (PDT) From: Kees Cook To: Andrew Morton Cc: Kees Cook , Christophe Leroy , Drew Davenport , Peter Zijlstra , Arnd Bergmann , "Steven Rostedt (VMware)" , Feng Tang , Petr Mladek , Mauro Carvalho Chehab , Borislav Petkov , YueHaibing , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] bug: Clean up helper macros to remove __WARN_TAINT() Date: Mon, 19 Aug 2019 16:41:09 -0700 Message-Id: <20190819234111.9019-6-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819234111.9019-1-keescook@chromium.org> References: <20190819234111.9019-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for cleaning up "cut here" even more, this removes the __WARN_*TAINT() helpers, as they limit the ability to add new BUGFLAG_* flags to call sites. They are removed by expanding them into full __WARN_FLAGS() calls. Signed-off-by: Kees Cook --- include/asm-generic/bug.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index f76efbcbe3b5..6ea8d258cb96 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h @@ -62,13 +62,11 @@ struct bug_entry { #endif #ifdef __WARN_FLAGS -#define __WARN_TAINT(taint) __WARN_FLAGS(BUGFLAG_TAINT(taint)) -#define __WARN_ONCE_TAINT(taint) __WARN_FLAGS(BUGFLAG_ONCE|BUGFLAG_TAINT(taint)) - #define WARN_ON_ONCE(condition) ({ \ int __ret_warn_on = !!(condition); \ if (unlikely(__ret_warn_on)) \ - __WARN_ONCE_TAINT(TAINT_WARN); \ + __WARN_FLAGS(BUGFLAG_ONCE | \ + BUGFLAG_TAINT(TAINT_WARN)); \ unlikely(__ret_warn_on); \ }) #endif @@ -89,7 +87,7 @@ struct bug_entry { * * Use the versions with printk format strings to provide better diagnostics. */ -#ifndef __WARN_TAINT +#ifndef __WARN_FLAGS extern __printf(4, 5) void warn_slowpath_fmt(const char *file, const int line, unsigned taint, const char *fmt, ...); @@ -99,11 +97,14 @@ void warn_slowpath_fmt(const char *file, const int line, unsigned taint, warn_slowpath_fmt(__FILE__, __LINE__, taint, arg) #else extern __printf(1, 2) void __warn_printk(const char *fmt, ...); -#define __WARN() do { \ - printk(KERN_WARNING CUT_HERE); __WARN_TAINT(TAINT_WARN); \ -} while (0) -#define __WARN_printf(taint, arg...) \ - do { __warn_printk(arg); __WARN_TAINT(taint); } while (0) +#define __WARN() do { \ + printk(KERN_WARNING CUT_HERE); \ + __WARN_FLAGS(BUGFLAG_TAINT(TAINT_WARN)); \ + } while (0) +#define __WARN_printf(taint, arg...) do { \ + __warn_printk(arg); \ + __WARN_FLAGS(BUGFLAG_TAINT(taint)); \ + } while (0) #endif /* used internally by panic.c */ -- 2.17.1