From patchwork Wed Jan 24 01:00:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 865119 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=quantonium-net.20150623.gappssmtp.com header.i=@quantonium-net.20150623.gappssmtp.com header.b="z6iVkSYg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zR6Kl2TyTz9s7s for ; Wed, 24 Jan 2018 12:00:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932273AbeAXBAl (ORCPT ); Tue, 23 Jan 2018 20:00:41 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:43130 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932083AbeAXBAk (ORCPT ); Tue, 23 Jan 2018 20:00:40 -0500 Received: by mail-pf0-f194.google.com with SMTP id y26so1713099pfi.10 for ; Tue, 23 Jan 2018 17:00:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantonium-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wE+oz5fCPYQk3FqNK8wpVVLZc9EHrT+TB/BgO4pVY2E=; b=z6iVkSYgxEqv8qnyYnyvvT9zNV7srgPw8r2tTSPH/3Hr6NNi4aSMEElHkrdZELDu9o 9Jf+6qDoV3LpAq8FzndYe4MSxKHq4feZF88FlO2pmaN+DhikrTQNV2oLyzpplCGZjdNT 1TUV2rIw1b5k1Qa9oD37TQ1LLkf/8yzQoWY7OeR6AlbSBGhbNw7O58eYV+PITsMO1hgx XUZKlf4gwQuY5122QLaVCKHsOLl09n9MvlVDXiBkgeWSEurUQ9kqyKVzS4VNE/ZBvx3H HYCWEE9/ZdTaskawFb5rBjLHGheM2K7QSaNqpQoowg3DQtm/wCh2uxiDfAodb1E3SRMp tDXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wE+oz5fCPYQk3FqNK8wpVVLZc9EHrT+TB/BgO4pVY2E=; b=TqOW6WDluh2516w/dotKXK4kazZ2szM/4yWAephUwe3TNZEuYcNJNGcOD/CWUKeSpW 7jAZ6w06SNhDrHNI/o7FKXig/jCXMxz92A6I7lMhDKcRwRrK80yRMl2TxGMSnM9wmxl7 7XttOveUm6tuq6AhtAKjOg9+E+IttUgbqRaX+n+QljSH3VEIS1ABIcjljRNQjgcdI7KU 8rEv+ib+XEtqCtx11T6HxT1WRUWCU79F4r3TR8TudR+WgbOaOT4cQUxd2SSXL3x1/qd+ 4comAZeZRcVrZq2r9jJSHVJEYUDBi4QAVX8I0XUEcHcVwP8yS6azkdmVJyYxtPGaAPXp 7I/Q== X-Gm-Message-State: AKwxytdne1GrKPY5tlub+CAIStkFMHxvCfHaqM4+3Vgrg3JheI5otl9P m/x+UsyAvr7A4N6gll7OaXN1Ug== X-Google-Smtp-Source: AH8x227TOA4BEjCCCO8Y9KYANEd0EXjZ5RjbZVmHYioQxFZI8Hh/lHku2CO3Trfu5nzHumTjJfEEMA== X-Received: by 2002:a17:902:123:: with SMTP id 32-v6mr6609982plb.278.1516755639911; Tue, 23 Jan 2018 17:00:39 -0800 (PST) Received: from localhost.localdomain (67-207-98-108.static.wiline.com. [67.207.98.108]) by smtp.gmail.com with ESMTPSA id b69sm10163993pfk.128.2018.01.23.17.00.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jan 2018 17:00:39 -0800 (PST) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, rohit@quantonium.net, jchapman@katalix.com, Tom Herbert Subject: [PATCH net-next 1/2] kcm: Only allow TCP sockets to be attached to a KCM mux Date: Tue, 23 Jan 2018 17:00:13 -0800 Message-Id: <20180124010014.2070-2-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180124010014.2070-1-tom@quantonium.net> References: <20180124010014.2070-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- net/kcm/kcmsock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index d4e98f20fc2a..474ea2200592 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -1391,6 +1391,15 @@ static int kcm_attach(struct socket *sock, struct socket *csock, if (csk->sk_family == PF_KCM) return -EOPNOTSUPP; + /* 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); if (!psock) return -ENOMEM; From patchwork Wed Jan 24 01:00:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 865120 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=quantonium-net.20150623.gappssmtp.com header.i=@quantonium-net.20150623.gappssmtp.com header.b="mcLiivyY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zR6Kn50gdz9s7s for ; Wed, 24 Jan 2018 12:00:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932410AbeAXBAo (ORCPT ); Tue, 23 Jan 2018 20:00:44 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:32821 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932083AbeAXBAm (ORCPT ); Tue, 23 Jan 2018 20:00:42 -0500 Received: by mail-pf0-f195.google.com with SMTP id t5so1726846pfi.0 for ; Tue, 23 Jan 2018 17:00:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantonium-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xj11J2vQK27z1vQnt06fBfheNTv0JAXvJA54w1KWlrw=; b=mcLiivyY+XpCAmnHOePfYf+dHl4L4ntxCRTboMu68qXW0lIuqttIKX6EV3+p8X/onK cSdT+ufTyx58ZAqKVtDnpAeikMGXHuYyQ6kskNsX5i/eA38o9AkDd5o8H9gMpWAVqnWS TCUm3zcdsNvufKL36hd6xma63GqPMcO46Fo79mbJcHCpFFAL6+SNAXfOlCfwucrdxx3Z 9HDYsNHFXRqmWzVlbmCWnjn4vGYQxylyDV06KWVIrY0upYQ01kLkKwddC2GdHm9Cym3B lIfOCfXV0dTV0AM6+4mbymcLHu5oOvqi94JuR1eYTj8YaWhpDUHThxTGSgmyFcdYXQJP /fqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xj11J2vQK27z1vQnt06fBfheNTv0JAXvJA54w1KWlrw=; b=ocU+IocxfxZPiJIQun2md4YCJ8eQVwI1Ht2HBBOZ0F18MEyyhAjjwEzFwaqI8bhI6Y 1axpKnAGz+8MgnN6zm8kq33b8UNWkXVEvVpYsAG9CIa6gdspjT3KaSnsVXq4cLHhTYdg 9ktaMEtoN5Ky0hM3dSp5RJTHFLKJTH7nZvbIIW8dPgY90EhRq+TWgAK+/LKNk5tbTRJs gnutVxMwE0O+EUDnixSIYn2eGUayZnsT2PluJpcKXIanHm8ncZQ3WJdnISAq43pIhrQi qzSpyHtqB8AkwbW9XrdgjjvGu119IPNBnBe5qyW0BKBsLBZVgciGyLdRHqAGdeFzx1+w gP6w== X-Gm-Message-State: AKwxytfsejS2+8anA9CL4ur4BHkurUaYv+SpWNNJ6XqDvXI7rY+jeHvd vnHAvBzqr/nG/7KiBjfSgVn87g== X-Google-Smtp-Source: AH8x224FgBRc5erdXyh/8KDS47RK49E5mbV4WGP1QZt6o6z+ncbf0R8eDdDBsySCinobOLg8AEymdQ== X-Received: by 2002:a17:902:2f03:: with SMTP id s3-v6mr4647609plb.112.1516755642219; Tue, 23 Jan 2018 17:00:42 -0800 (PST) Received: from localhost.localdomain (67-207-98-108.static.wiline.com. [67.207.98.108]) by smtp.gmail.com with ESMTPSA id b69sm10163993pfk.128.2018.01.23.17.00.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jan 2018 17:00:41 -0800 (PST) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, rohit@quantonium.net, jchapman@katalix.com, Tom Herbert Subject: [PATCH net-next 2/2] kcm: Check if sk_user_data already set in kcm_attach Date: Tue, 23 Jan 2018 17:00:14 -0800 Message-Id: <20180124010014.2070-3-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180124010014.2070-1-tom@quantonium.net> References: <20180124010014.2070-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- net/kcm/kcmsock.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 474ea2200592..5ae02a5b0838 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -1414,9 +1414,18 @@ static int kcm_attach(struct socket *sock, struct socket *csock, 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; @@ -1424,8 +1433,11 @@ static int kcm_attach(struct socket *sock, struct socket *csock, 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;