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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 7C039C433E1 for ; Thu, 30 Jul 2020 08:20:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4B840204EA for ; Thu, 30 Jul 2020 08:20:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596097225; bh=LKGNT2qVhcOAafZ2dGb9zKN9EZp306o8SFySeGT4rD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CK9nz80TjlfuaQroUC0mSaUNbpdWSk8lAzedFaTlOCjOXcyWsJBRNVHEgn/FVHwgI VrU/HO5PVsQhy9m6SMnfU8pYd74VNU9rNdLb8Nq0DQBFvtRx4Gc+OMVgUYAghW09ru sTqpvCvjj3iHpkS94RGEyYG8kmzbe+VkFVRvvJwM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729268AbgG3IUY (ORCPT ); Thu, 30 Jul 2020 04:20:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:43556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726194AbgG3IGF (ORCPT ); Thu, 30 Jul 2020 04:06:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 500CE206C0; Thu, 30 Jul 2020 08:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596096364; bh=LKGNT2qVhcOAafZ2dGb9zKN9EZp306o8SFySeGT4rD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X2vIrl6dUKVd1ONs/F+uJVCw62+FKtsZPxjLeAwMD0TLBjUDhUQ5JBROt/E8JI4xs JcnLkJXdkLuFGZo7BhS6OCYxKRfWDz4F9F8sQecgPUXgYa9TeUxaYslqsx4WGAbru8 H7xyarOYGvxjuML5fgbqyF3RBEkXvRnhxxcPTZY8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bjorn Andersson , Eric Dumazet , Cong Wang , Eric Dumazet , "David S. Miller" , syzbot+6720d64f31c081c2f708@syzkaller.appspotmail.com Subject: [PATCH 5.4 08/19] qrtr: orphan socket in qrtr_release() Date: Thu, 30 Jul 2020 10:04:10 +0200 Message-Id: <20200730074420.924420214@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200730074420.502923740@linuxfoundation.org> References: <20200730074420.502923740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Cong Wang [ Upstream commit af9f691f0f5bdd1ade65a7b84927639882d7c3e5 ] We have to detach sock from socket in qrtr_release(), otherwise skb->sk may still reference to this socket when the skb is released in tun->queue, particularly sk->sk_wq still points to &sock->wq, which leads to a UAF. Reported-and-tested-by: syzbot+6720d64f31c081c2f708@syzkaller.appspotmail.com Fixes: 28fb4e59a47d ("net: qrtr: Expose tunneling endpoint to user space") Cc: Bjorn Andersson Cc: Eric Dumazet Signed-off-by: Cong Wang Reviewed-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/qrtr/qrtr.c | 1 + 1 file changed, 1 insertion(+) --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -1004,6 +1004,7 @@ static int qrtr_release(struct socket *s sk->sk_state_change(sk); sock_set_flag(sk, SOCK_DEAD); + sock_orphan(sk); sock->sk = NULL; if (!sock_flag(sk, SOCK_ZAPPED))