From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 873EA16ABF3 for ; Fri, 5 Apr 2024 10:53:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712314393; cv=none; b=JsStJb9t+/NbXSUDctohCD/HjqOzgRkrOnEEQdO7sG7xLKp6jm+WKvaWJvzaRJsmOYfvHgW7URQ/o20ArsXxzwo6D0RfxbDJiEqyjovIGIJ7k5994pvY0l4lY9EU0U8Zzyt0shhvdV1bCt1sO99m1Kha0T0PCUDCrXlBx2JjJz0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712314393; c=relaxed/simple; bh=vIao4mFbYmfy1do2DLOtvnLfgCeudIqaDvgEwbEZPn0=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=D0Y52y4siUW1OB8kKt8bvoEmlwgG9kN3phJp/jMNltf71eLyWLdMaIyGMazJ2m9AhVK9F/4J+VAxH5W6RcnYu0oEgDaAhHPUgN5mZjoPDRbTw3u0AqvNzZ7uFraAVt97WAq/endDwhToElxFdEIWTv7vHDisCt8WGfxYLfMVnzk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lU9VfS++; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lU9VfS++" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADAE1C433C7; Fri, 5 Apr 2024 10:53:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712314393; bh=vIao4mFbYmfy1do2DLOtvnLfgCeudIqaDvgEwbEZPn0=; h=Subject:To:Cc:From:Date:From; b=lU9VfS++NuBbTUkHBJbwzPY1ki0+ittGv2jgHjvS/uSbV9XlHx0493N9lIIWhjS/M 2m5i2kRiAPvY7FL+veS5EOR/tnhhabTnQ7ITryzdHIR+n6rQrFVE5GO1i14uXRREzo nmhN3L/F3KzwsOal7i0p13nKRbc7/PawZZSjRx4M= Subject: FAILED: patch "[PATCH] ax25: fix use-after-free bugs caused by ax25_ds_del_timer" failed to apply to 5.15-stable tree To: duoming@zju.edu.cn,horms@kernel.org,kuba@kernel.org Cc: From: Date: Fri, 05 Apr 2024 12:53:07 +0200 Message-ID: <2024040506-earmark-skydiver-ab1c@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x fd819ad3ecf6f3c232a06b27423ce9ed8c20da89 # git commit -s git send-email --to '' --in-reply-to '2024040506-earmark-skydiver-ab1c@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From fd819ad3ecf6f3c232a06b27423ce9ed8c20da89 Mon Sep 17 00:00:00 2001 From: Duoming Zhou Date: Fri, 29 Mar 2024 09:50:23 +0800 Subject: [PATCH] ax25: fix use-after-free bugs caused by ax25_ds_del_timer When the ax25 device is detaching, the ax25_dev_device_down() calls ax25_ds_del_timer() to cleanup the slave_timer. When the timer handler is running, the ax25_ds_del_timer() that calls del_timer() in it will return directly. As a result, the use-after-free bugs could happen, one of the scenarios is shown below: (Thread 1) | (Thread 2) | ax25_ds_timeout() ax25_dev_device_down() | ax25_ds_del_timer() | del_timer() | ax25_dev_put() //FREE | | ax25_dev-> //USE In order to mitigate bugs, when the device is detaching, use timer_shutdown_sync() to stop the timer. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Duoming Zhou Reviewed-by: Simon Horman Link: https://lore.kernel.org/r/20240329015023.9223-1-duoming@zju.edu.cn Signed-off-by: Jakub Kicinski diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c index c5462486dbca..282ec581c072 100644 --- a/net/ax25/ax25_dev.c +++ b/net/ax25/ax25_dev.c @@ -105,7 +105,7 @@ void ax25_dev_device_down(struct net_device *dev) spin_lock_bh(&ax25_dev_lock); #ifdef CONFIG_AX25_DAMA_SLAVE - ax25_ds_del_timer(ax25_dev); + timer_shutdown_sync(&ax25_dev->dama.slave_timer); #endif /*