Received: by 10.223.185.116 with SMTP id b49csp1041603wrg; Fri, 23 Feb 2018 10:51:20 -0800 (PST) X-Google-Smtp-Source: AH8x22673Cafe3iohWSr5ws5WQnphYmZN90Hl+/GUqgX/+eCpkTRH17v+riI5DMmmJYddQTTVelq X-Received: by 10.98.14.200 with SMTP id 69mr2668436pfo.168.1519411880371; Fri, 23 Feb 2018 10:51:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519411880; cv=none; d=google.com; s=arc-20160816; b=Nus30CT38LPwhF4KAtx1N6c7z4fzdWkS+KJRi9Rp9z5IC0Awek5T3sTdbpWgxUYLZW PuSxLtHisDZn6kbr6jAqreicDdLfDXWht+JkziUiLEEgr3lVUE4jKzxl0W2lkHwO8pbw oCHXBVckZN5tvMJ0TXBYf3Dn3JDHR2CD1C9z+W5kq3CtYlOVVJ54x/GNyoqHodq/CDRs 0rHsR6Dmtv6sQ5AsNb5my6JkDsLPQgQU5nGkOvPIpNYkHCCGUUmLijkRq3cSraN/FUV8 QSvclrkHgIbT62/JONXBXtVc34zilhPvWTcSCbNk4Adv4nIvfD5KjZl3lkgu6mmmyTHa luQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=c1mtNUK2cfuldYUwjqEFOSqmLNB6wiNROOupBYxXYgg=; b=eJuR1ddwwVaiGAjtQvcb9WS8NQ+5kAVN0lt50RADlWUXPOapKhVGv8HN/JMeV9ydeq POmKvf1E3UCVDQp1gmZtZc7Bv66bLpBXmJeoRXL/drwAesLPAUfCY7FQilDQiX4RF4qp OkMYOnioaH8+Nh89FcPatvkQP0kbUIS6CycBvqZyDsX5XiVG7je4UaMZMwAkETqoh6Zw oLsHWaF2TuJWzacZyUDq5G3fwWY80q1cfj840xvAT0f+OTnl0h50OE/PymkuINqF+qkZ 4amDF26QnCa1mCu1EYM3TCWpgDDiu+N5zptAEX+wnPhVrUdTsptUKivDxZL9t/4dwrNu 0wnQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 63-v6si2149429pla.526.2018.02.23.10.51.05; Fri, 23 Feb 2018 10:51:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934740AbeBWSu2 (ORCPT + 99 others); Fri, 23 Feb 2018 13:50:28 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:45636 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934450AbeBWSuZ (ORCPT ); Fri, 23 Feb 2018 13:50:25 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 15CDD1297; Fri, 23 Feb 2018 18:50:24 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+114b15f2be420a8886c3@syzkaller.appspotmail.com, Tom Herbert , Eric Dumazet , "David S. Miller" Subject: [PATCH 4.14 003/159] kcm: Check if sk_user_data already set in kcm_attach Date: Fri, 23 Feb 2018 19:25:11 +0100 Message-Id: <20180223170743.496615531@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tom Herbert commit e5571240236c5652f3e079b1d5866716a7ad819c upstream. This is needed to prevent sk_user_data being overwritten. The check is done under the callback lock. This should prevent a socket from being attached twice to a KCM mux. It also prevents a socket from being attached for other use cases of sk_user_data as long as the other cases set sk_user_data under the lock. Followup work is needed to unify all the use cases of sk_user_data to use the same locking. Reported-by: syzbot+114b15f2be420a8886c3@syzkaller.appspotmail.com Fixes: ab7ac4eb9832 ("kcm: Kernel Connection Multiplexor module") Signed-off-by: Tom Herbert Reviewed-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/kcm/kcmsock.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -1405,9 +1405,18 @@ static int kcm_attach(struct socket *soc return err; } - sock_hold(csk); - write_lock_bh(&csk->sk_callback_lock); + + /* Check if sk_user_data is aready by KCM or someone else. + * Must be done under lock to prevent race conditions. + */ + if (csk->sk_user_data) { + write_unlock_bh(&csk->sk_callback_lock); + strp_done(&psock->strp); + kmem_cache_free(kcm_psockp, psock); + return -EALREADY; + } + psock->save_data_ready = csk->sk_data_ready; psock->save_write_space = csk->sk_write_space; psock->save_state_change = csk->sk_state_change; @@ -1415,8 +1424,11 @@ static int kcm_attach(struct socket *soc csk->sk_data_ready = psock_data_ready; csk->sk_write_space = psock_write_space; csk->sk_state_change = psock_state_change; + write_unlock_bh(&csk->sk_callback_lock); + sock_hold(csk); + /* Finished initialization, now add the psock to the MUX. */ spin_lock_bh(&mux->lock); head = &mux->psocks;