Received: by 10.223.185.116 with SMTP id b49csp1083536wrg; Fri, 23 Feb 2018 11:37:30 -0800 (PST) X-Google-Smtp-Source: AH8x226NXUNCrE/eDtRJ9TeCX+UKtdfbHoFVKXwEVZLBW5C348uq7qnHqModMteG5V7Yi6exCNXu X-Received: by 10.99.125.19 with SMTP id y19mr2181046pgc.285.1519414650171; Fri, 23 Feb 2018 11:37:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519414650; cv=none; d=google.com; s=arc-20160816; b=loc0b1UvekIxn+ivMK1PVu6bQ8g+cqFAEwFTr7t3kAuwYh/e9qlFPF9wW03XigUXeg SPlX4NaHTE1xkIG0kWHQXOlp1eR4x63weQXuaBOyqyzzawxLuHmqHkfjaHnJ40JiUoAw 9LEfwPNfalkbG/i9810jIXRYz4rj7tHyneCigfWVk+Uu6L6i4NiPuRZAJThMLPiW2pn/ TucO/30PUrOHTz/7zFasHvcEALoozZOftF+dTj0dp5Aa7+igDVFBJYq4myBowhEUscDd xz3ZMB3YBC8uCIYnxgFs8mPQQ2jfq+oXavl4ZocJY1xdMmdv9LVgVYeJ6JhWY2n2iLTb PM3Q== 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=ZwHlVguxbwnXUW5gjNOuADdTNAlwRhvEvrcB819S7rs=; b=ja354pE83JvgaEl6Si4/DJJtXp2BkEdWRAwg5prAPBZr0PzXu6dg+gTHKm596puesm h6YNg11L+O32dLdjLCPdkl783Cg+UTLqNwY/P9AJPy7L4Wv4PEE5VGZA3OsVV1/2dUzL ZXy0QSxu3rh6FFkFqgTDgoG+McL01EKBhKFM6T8sfuagPn12jt4u7FriiOe94H6LXV1d spatrjvJPmEM6Gel0t+xHNf5jomogSOYNDuw/EzSZCkpmn60LbbAW7ZtIWAHLwdxPc8a ZPq1UIjRVwryrbaCNBmQHNcz8pPI/bKK/aJPoq5M6+VBbhiWoH3cre2+xfDQb46GPh4v nYiw== 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 j63si1877306pgc.484.2018.02.23.11.37.13; Fri, 23 Feb 2018 11:37:30 -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 S1754631AbeBWTg1 (ORCPT + 99 others); Fri, 23 Feb 2018 14:36:27 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:45702 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934753AbeBWSuf (ORCPT ); Fri, 23 Feb 2018 13:50:35 -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 5EF681297; Fri, 23 Feb 2018 18:50:34 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+8865eaff7f9acd593945@syzkaller.appspotmail.com, Tom Herbert , Eric Dumazet , "David S. Miller" Subject: [PATCH 4.14 004/159] kcm: Only allow TCP sockets to be attached to a KCM mux Date: Fri, 23 Feb 2018 19:25:12 +0100 Message-Id: <20180223170743.619638064@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 581e7226a5d43f629eb6399a121f85f6a15f81be upstream. TCP sockets for IPv4 and IPv6 that are not listeners or in closed stated are allowed to be attached to a KCM mux. Fixes: ab7ac4eb9832 ("kcm: Kernel Connection Multiplexor module") Reported-by: syzbot+8865eaff7f9acd593945@syzkaller.appspotmail.com 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -1387,8 +1387,13 @@ static int kcm_attach(struct socket *soc if (!csk) return -EINVAL; - /* We must prevent loops or risk deadlock ! */ - if (csk->sk_family == PF_KCM) + /* Only allow TCP sockets to be attached for now */ + if ((csk->sk_family != AF_INET && csk->sk_family != AF_INET6) || + csk->sk_protocol != IPPROTO_TCP) + return -EOPNOTSUPP; + + /* Don't allow listeners or closed sockets */ + if (csk->sk_state == TCP_LISTEN || csk->sk_state == TCP_CLOSE) return -EOPNOTSUPP; psock = kmem_cache_zalloc(kcm_psockp, GFP_KERNEL);