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;
From:   Eiichi Tsukata <eiichi.tsukata@nutanix.com>
To:     paul@paul-moore.com, eparis@redhat.com,
        linux-kernel@vger.kernel.org, audit@vger.kernel.org
Cc:     Eiichi Tsukata <eiichi.tsukata@nutanix.com>
Subject: [PATCH v2 5/5] audit: do not use exclusive wait in audit_receive()
Date:   Thu, 11 May 2023 05:21:16 +0000
Message-Id: <20230511052116.19452-6-eiichi.tsukata@nutanix.com>
In-Reply-To: <20230511052116.19452-1-eiichi.tsukata@nutanix.com>
References: <20230511052116.19452-1-eiichi.tsukata@nutanix.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cpW0K41iPOvc28Pl8sj9uJb7m/uPqZQj+e1blfUnQU/q1dfXsFDn8WiNYaSp?=
 =?us-ascii?Q?1uvm7KQ4xCGNGvpjW9qytJ9Q831b27pMcH2Fw4HxTWiwjGf+xNbjoiHxWrhr?=
 =?us-ascii?Q?B/YiVGi86loeY32fR2YHeoLw/ywTkYE4KAAJB/md8JlfeVBHx+rzvz9exE9o?=
 =?us-ascii?Q?LtEVsjCcyhOYIFjUNomfHLyrYpZIqHlc7XjdMjuZXQCgcFoaCrJ69VR4+Tcn?=
 =?us-ascii?Q?VGt9fiPSm3Vz/ICKek+9ZeQCLOJ+oPKrZSWugmFbCB0JCo1jpPG/bZ71mwtv?=
 =?us-ascii?Q?B5kb5a7nL7PXaKxAtqoID0hFjm3i6jz9GAXqyHbPMHrBqLoSyHGOr4m4y2+E?=
 =?us-ascii?Q?/YmolFsig+WzRPeTCRvm4TFok4U9GFo4lZ+BskJZyGSQlNwzm5FNb4wZL3A0?=
 =?us-ascii?Q?TOP06lixEb2+QVYET2eSBihcTtWVU3xNCynwgR2au27mnugZW53W1A7D0pht?=
 =?us-ascii?Q?xzXsAmFcnfAD34wWCeEoA94qDPwzjSbco0tdb9ugdlr+csBw+G3jpKLaCO6c?=
 =?us-ascii?Q?yitEwxqiQrUKW0Vr9soZ64VESyE6YBEdyHcBtVBKvexB5aM0aLXeJB1bwlEN?=
 =?us-ascii?Q?nopoVUDkXTxt0GMUCNfJtWzrDSmni+QSWh3f3r3g56ygI2mWu4Bc+mtLAP1j?=
 =?us-ascii?Q?6nHsikMTDkgHQ8iDaMnZAVLDM/MKyTyXAj53o7r3sU5GtTbXBoowP6JtpHxp?=
 =?us-ascii?Q?PDV03ws4ZYhR1uySxqmMSgLgcd8ilIccKUCZyXz/xaahroVhFmLhZGY22g2a?=
 =?us-ascii?Q?4ThyzgMKEOw9+QMmtdLOAZ+fMPid7DGUYP/vhD2ob1blrrSQKjQapv6ojIc7?=
 =?us-ascii?Q?XQpEFBjhBhOOESgIPQCxbeT27VFmj4S0ZvINmnBlNPLFCERjZQrwjO6NSkcy?=
 =?us-ascii?Q?rrUttUDBHVhl5zLOurX2T52G+DZaXh4sNAzbOBgGD62TDM+rBxiDc9PMNle4?=
 =?us-ascii?Q?6NHx4tvVfpaUmB4ExTJgKWF3ubWHO3F/c23UM4W9AZg8W3FWYekJ5aj561ib?=
 =?us-ascii?Q?dbvGJ/Q3pg1V0VJKUyu+kAtts4aa2ZAw+eJuw6NGBEzrfwr8bf2uR1rAmzsE?=
 =?us-ascii?Q?hEfuPSEKVCp3kmUqzYToIEJHG/oNIcSn1Im8snkFg79kaW9dxXm3fEkXN1f1?=
 =?us-ascii?Q?TCiEP683KmTYIzvrYBZnubjA0KKEEZB4iiM3PCZp41X6q0rigEFZA7b4wpzd?=
 =?us-ascii?Q?aigxvs5rFzly7zQVJKOHEhyJReTNQbHrkXSCZCm/1Rd3/iq0cd5MHUCAxZhx?=
 =?us-ascii?Q?U90ugLqkJIJJEzMBKeuQvy/Eh0LAMYXi7wcFOv6dmyZjfupw5wCUm+4F6W4h?=
 =?us-ascii?Q?T42Cyc3OyiSDqekYkgiPz3nYCtWCYdUfYdvyDg3phAqor4LX/5gcU+cj1tBf?=
 =?us-ascii?Q?sGp4LY1UzhMVhb4l+wpuRq875psbFY7QuqA2367EeZVAsR/55jReTjmdBz7O?=
 =?us-ascii?Q?AShLRcGmkSJwgX9OHf8stlH89IuIa1n99pGkwmkRmAM7mGrt3tUhke5UXrGL?=
 =?us-ascii?Q?RvLBdwKcbgIh/tystqz4t+Rudi5FuSTFt50zZDdpziySVL8XMuVF43HPnAXu?=
 =?us-ascii?Q?t2xAVMTW3dd9BYOQmmDQ/wUrHQpyacMcwYOjYWaEQvhcie4ddspeCWFvPSMe?=
 =?us-ascii?Q?/A=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5eaa4a92-191d-43f1-6961-08db51df960d
X-MS-Exchange-CrossTenant-AuthSource: CH0PR02MB8041.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2023 05:21:34.1358
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: NCTZ4iegDJiTDqSnX0M65gybjYL2OmfkDlouUPKsOv6RJbibq2iNJDFcR4ayIbWCVqEbmtR9R0OUV5l2XI3k2+8tcQBuHnhp4u7zZDauWR0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR02MB10006
X-Proofpoint-GUID: rQaDxQovDCV8cydJxqN48Bjz3J_66dou
X-Proofpoint-ORIG-GUID: rQaDxQovDCV8cydJxqN48Bjz3J_66dou
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-10_04,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Reason: safe
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

kauditd thread issues wake_up() before it goes to sleep. The wake_up()
call wakes up only one process as waiter side uses exclusive wait.
This can be problematic when there are multiple processes (one is in
audit_receive() and others are in audit_log_start()) waiting on
audit_backlog_wait queue.

For example, if there are two processes waiting:

  Process (A): in audit_receive()
  Process (B): in audit_log_start()

And (A) is at the head of the wait queue. Then kauditd's wake_up() only
wakes up (A) leaving (B) as it is even if @audit_queue is drained. As a
result, (B) can be blocked for up to backlog_wait_time.

To prevent the issue, use non-exclusive wait in audit_receive() so that
kauditd can wake up all waiters in audit_receive().

Fixes: 8f110f530635 ("audit: ensure userspace is penalized the same as the kernel when under pressure")
Signed-off-by: Eiichi Tsukata <eiichi.tsukata@nutanix.com>
---
 kernel/audit.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 6b0cc0459984..ef48210343ae 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -631,22 +631,27 @@ static void kauditd_retry_skb(struct sk_buff *skb, __always_unused int error)
 /**
  * wait_for_kauditd - Wait for kauditd to drain the queue
  * @stime: time to sleep
+ * @exclusive: use exclusive wait if true
  *
  * Description:
  * Waits for kauditd to drain the queue then adds duration of sleep time to
  * audit_backlog_wait_time_actual as cumulative sum.
  * Returns remaining time to sleep.
  */
-static long wait_for_kauditd(long stime)
+static long wait_for_kauditd(long stime, bool exclusive)
 {
 	long rtime;
 	DEFINE_WAIT(wait);
 
-	prepare_to_wait_exclusive(&audit_backlog_wait, &wait,
-				  TASK_UNINTERRUPTIBLE);
+	if (exclusive)
+		prepare_to_wait_exclusive(&audit_backlog_wait, &wait,
+					  TASK_UNINTERRUPTIBLE);
+	else
+		prepare_to_wait(&audit_backlog_wait, &wait,
+				TASK_UNINTERRUPTIBLE);
 
 	/* need to check if the queue is full again because kauditd might have
-	 * flushed the queue and went to sleep after prepare_to_wait_exclusive()
+	 * flushed the queue and went to sleep after prepare_to_wait_*()
 	 */
 	if (audit_queue_full(&audit_queue)) {
 		rtime = schedule_timeout(stime);
@@ -1601,7 +1606,7 @@ static void audit_receive(struct sk_buff  *skb)
 	if (audit_queue_full(&audit_queue)) {
 		/* wake kauditd to try and flush the queue */
 		wake_up_interruptible(&kauditd_wait);
-		wait_for_kauditd(audit_backlog_wait_time);
+		wait_for_kauditd(audit_backlog_wait_time, false);
 	}
 }
 
@@ -1900,7 +1905,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
 			/* sleep if we are allowed and we haven't exhausted our
 			 * backlog wait limit */
 			if (gfpflags_allow_blocking(gfp_mask) && stime > 0) {
-				stime = wait_for_kauditd(stime);
+				stime = wait_for_kauditd(stime, true);
 			} else {
 				if (audit_rate_check() && printk_ratelimit())
 					pr_warn("audit_backlog=%d > audit_backlog_limit=%d\n",
-- 
2.40.0