From patchwork Mon Mar 21 15:28:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1607804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=rYRTZFN2; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KMdnZ2Sykz9s1l for ; Tue, 22 Mar 2022 02:29:05 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nWJxn-0005Gf-0w; Mon, 21 Mar 2022 15:28:55 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nWJxi-0005GY-QW for kernel-team@lists.ubuntu.com; Mon, 21 Mar 2022 15:28:50 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 9FF5C3F1AC for ; Mon, 21 Mar 2022 15:28:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1647876530; bh=xQRryYDzZsFeZifB4UkxBzXlrR/CsMJaXGMkzgt1H8k=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=rYRTZFN2e4DXIeqPYfxfEFq+db2CTH4twHBDob6uwFMppwNwArpXujakQiqzGUcrE hgoYZQ/mmtSXUrVZBcd6uMAdwDh+jbI3tiuOZBmmuXsPXEf+Yaxq85Vqvypi09rfXE LZeXhd8J82aoc9VRexLZdMejI7Jf9SucJD7W3WRlhTi60nK+f3IIygWlET36FwKRoU g9vGKMCbpGLvaDJY5DOJ7Qo8jEtkG+g4Lg38cqjJ8rNUdb7m7hoc8tV3fQgAV5P4tP mI3jWyYoYfGuvYbninuqB+JdpfsF3kW75W49sy55N3LTUnktO4H1ZLY7MXl7vh6b6f kESOVHBPSL2jw== Received: by mail-wm1-f72.google.com with SMTP id r128-20020a1c4486000000b0038c8655c40eso4415wma.6 for ; Mon, 21 Mar 2022 08:28:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xQRryYDzZsFeZifB4UkxBzXlrR/CsMJaXGMkzgt1H8k=; b=MSIrvTgFZzePWV+6MSLRJQ5TYiQGCaIb1ugpPcY9ZlKnaKunKDRtWvoHfkDtXTNfZy fxbx6bXEpntlqw+u2Wc3l+OeWcOSq31RcsqMdLDo0zK2I5JMdEJ59mFUEBq7DzgV4Qv7 wM6hRP33eS0xGgWjB43nMupIeYcMh84hyh6r+qqXqsk8l/pUj85qviAXAbIG74Acq03z zvkrKE00Acck1GJUJA1FvnfUWHdUgs9iua8jYa6TkCYJjY7vCJP6oH2k3Pf/0Z/G2FDf nf4sqWGZYg64zDAiyL2dkxI+PvsWi9Ic/mFBwQQejmxPbk4R5sWIUM//GufBPiudw5t6 VUZA== X-Gm-Message-State: AOAM533Sa0877NR8Tvb8Hee/7HOa0nGVXCzZLcYVCLlKDeSyeLLaIPaX sFMo38nEGKuECfyYl1A56n1/x8PiPum3qDLXfsew6pvh3ccvZButVB+RtjYSbY1zDYkms8QsTUs hlZ8MM0hm67he9FGRdHTl6W8r43A/FweiJo4/Z2/Ixw== X-Received: by 2002:adf:f804:0:b0:1f0:326e:5e78 with SMTP id s4-20020adff804000000b001f0326e5e78mr19151917wrp.251.1647876529742; Mon, 21 Mar 2022 08:28:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/ox6EZeEnWRkbadJuE9g5lJwf6Mon8x+iTLpKpj1F/atZEOl7uqw++19+iZO4I5+Xz8mylg== X-Received: by 2002:adf:f804:0:b0:1f0:326e:5e78 with SMTP id s4-20020adff804000000b001f0326e5e78mr19151902wrp.251.1647876529414; Mon, 21 Mar 2022 08:28:49 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:a63e:b7ec:f3c7:2d0e]) by smtp.gmail.com with ESMTPSA id 11-20020a05600c26cb00b0037ff53511f2sm16485114wmv.31.2022.03.21.08.28.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 08:28:49 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J/linux][J/linux-unstable][PATCH] UBUNTU: SAUCE: Audit: Fix incorrect static inline function declration. Date: Mon, 21 Mar 2022 15:28:46 +0000 Message-Id: <20220321152846.458128-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" The LSM attributes SAUCE patches have incorrect syntax for the case when AUDIT framework is turned off, such as zfcpdump_defconfig. This in turn breaks building zfcpdump-kernel from Ubuntu patched sources. Reproducer: make ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- zfcpdump_defconfig make ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- bzImage BugLink: https://bugs.launchpad.net/bugs/1965766 Fixes: 558fd844dd ("UBUNTU: SAUCE: Audit: Add a new record for multiple object LSM attributes") Signed-off-by: Dimitri John Ledkov --- include/linux/audit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/audit.h b/include/linux/audit.h index 55c73ceb12..05ea137ce0 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -253,7 +253,7 @@ static inline void audit_log_path_denied(int type, const char *operation) static inline void audit_log_lsm(struct lsmblob *blob, bool exiting) { } static inline int audit_log_task_context(struct audit_buffer *ab, - struct lsmblob *blob); + struct lsmblob *blob) { return 0; }