From patchwork Fri Jul 21 11:21:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiu Jianfeng X-Patchwork-Id: 123809 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp140514vqg; Fri, 21 Jul 2023 04:38:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlGTjkY+2dpzLWgAj9tN+RMKKdFYngfD/Aryy51hlyuG/0vSIsQZ6EqEfCE884qjORFgCuCH X-Received: by 2002:a05:6a00:3928:b0:666:c1ae:3b87 with SMTP id fh40-20020a056a00392800b00666c1ae3b87mr12347263pfb.12.1689939511894; Fri, 21 Jul 2023 04:38:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689939511; cv=none; d=google.com; s=arc-20160816; b=yyDXaj/pcq3lznaPx6nftQwMmVHsHbesSeqVpExgpkDEdgFNH/pGPAiFS50d7senEe CoDG86fvjW0yDRPdL45/fH2XFm3oriVmnyU1W4zD3eM0eBbAnm+MqV1H6J+yjW1o9iPe czjk/ldzUBiY646RqVQxQQejxdijZIP+HwlpxkFPY1nYwSl3G21kcSLVtUhV5n/yJBmQ U9Hzo8cBp91fUIXcOShifTn3nVvWGAmWT6RIJGIB7C7AY1PF62shfDn6rmQoKd//c5mJ dkNzUUuzZ2smoW/v43lxC2Vpipcq3+Xo1TDqEc/4Ykd9luAhvruoBq4/iPys3MQMPbli GJrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=KBfm02OnscRtJNX/8vF+OQnL/wmuxj/9oV3T2F1tjHQ=; fh=XWfcfcroRSZieowWqIIHavkrtv5VeGEqe210//Xen5U=; b=CPiA6eiJCHh1JAaLyDb7GkVG+nqXGhUnFvhKk4wJtBlbVEnc5RvAPc5LwjHhsSAUAU uNQ78CzGaM6SaSajrLuamTeeZWzqmLWIvFzwfkJRTEDll4+JYp8YmTeXpopM51dKjncE No+kIK7Q8TyuUJZbBdm1NqVXR8zXLE8gno//OnlMxsf93v9066TZd6l4tTEW9PU64sQg ptGYSb8loQd8Tsiwa5Aj/7cUjOlpO+Ou80ZTxfOPy03UG64O8N9knn+UDd7c72+mmsaw 6iLbHRWh0RpSjykRYDfut3615h65kjq9mI4aNBCCwkrMDlgEamKoj5vcI4065IZ8rrTE HnIQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cn11-20020a056a00340b00b006827c671c1asi2794279pfb.226.2023.07.21.04.38.13; Fri, 21 Jul 2023 04:38:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230052AbjGULWY (ORCPT + 99 others); Fri, 21 Jul 2023 07:22:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229896AbjGULWW (ORCPT ); Fri, 21 Jul 2023 07:22:22 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09752198D; Fri, 21 Jul 2023 04:22:20 -0700 (PDT) Received: from dggpeml100024.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4R6nDL6hbYzVjlR; Fri, 21 Jul 2023 19:20:50 +0800 (CST) Received: from hulk-vt.huawei.com (10.67.174.26) by dggpeml100024.china.huawei.com (7.185.36.115) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 21 Jul 2023 19:22:17 +0800 From: Xiu Jianfeng To: , CC: , Subject: [PATCH -next] audit: correct audit_filter_inodes() definition Date: Fri, 21 Jul 2023 11:21:01 +0000 Message-ID: <20230721112101.176222-1-xiujianfeng@huawei.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.67.174.26] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml100024.china.huawei.com (7.185.36.115) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772030013593537766 X-GMAIL-MSGID: 1772030013593537766 After changes in commit 0590b9335a1c ("fixing audit rule ordering mess, part 1"), audit_filter_inodes() returns void, so if CONFIG_AUDITSYSCALL not defined, it should be do {} while(0). Signed-off-by: Xiu Jianfeng --- kernel/audit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/audit.h b/kernel/audit.h index 94738bce40b2..a60d2840559e 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -334,7 +334,7 @@ static inline int audit_signal_info_syscall(struct task_struct *t) return 0; } -#define audit_filter_inodes(t, c) AUDIT_STATE_DISABLED +#define audit_filter_inodes(t, c) do { } while (0) #endif /* CONFIG_AUDITSYSCALL */ extern char *audit_unpack_string(void **bufp, size_t *remain, size_t len);