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=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=no 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 62718C2D0DB for ; Wed, 29 Jan 2020 14:55:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D5492070E for ; Wed, 29 Jan 2020 14:55:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726643AbgA2OzD (ORCPT ); Wed, 29 Jan 2020 09:55:03 -0500 Received: from Chamillionaire.breakpoint.cc ([193.142.43.52]:42552 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726271AbgA2OzD (ORCPT ); Wed, 29 Jan 2020 09:55:03 -0500 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1iwok8-00077s-PJ; Wed, 29 Jan 2020 15:55:00 +0100 From: Florian Westphal To: Cc: matthieu.baerts@tessares.net, mathew.j.martineau@linux.intel.com Subject: [PATCH net 0/4] mptcp: fix sockopt crash and lockdep splats Date: Wed, 29 Jan 2020 15:54:42 +0100 Message-Id: <20200129145446.26425-1-fw@strlen.de> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Christoph Paasch reported a few bugs and lockdep splats triggered by syzkaller. One patch fixes a crash in set/getsockopt. Two patches fix lockdep splats related to the order in which RTNL and socket lock are taken. Last patch fixes out-of-bounds access when TCP syncookies are used. Change since last iteration on mptcp-list: - add needed refcount in patch 2 - call tcp_get/setsockopt directly in patch 2 Other patches unchanged except minor amends to commit messages. include/linux/tcp.h | 2 -- net/ipv4/syncookies.c | 4 ++++ net/ipv4/tcp_input.c | 3 +++ net/ipv6/syncookies.c | 3 +++ net/mptcp/protocol.c | 54 ++++++++++++++++++++++++++++++++---------------------- net/mptcp/subflow.c | 5 ++++- 6 files changed, 46 insertions(+), 25 deletions(-)