From patchwork Thu Dec 28 01:16:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 853287 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="b6gFJPXE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z6WzH68fBz9s7M for ; Thu, 28 Dec 2017 12:17:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752807AbdL1BRJ (ORCPT ); Wed, 27 Dec 2017 20:17:09 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:40794 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752637AbdL1BRH (ORCPT ); Wed, 27 Dec 2017 20:17:07 -0500 Received: by mail-pf0-f196.google.com with SMTP id v26so20384954pfl.7 for ; Wed, 27 Dec 2017 17:17:07 -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=zN26o4jtAiQFjn/+R1t/+dRnQZzL2loOje0OjCX3wnQ=; b=b6gFJPXEcuul14wr++cef1gaIjL9Sm7fCJD9pT/irbGoKPSrFEHRFdgEY3wWHLIr4Y oxJktF3mWRtL1BgN0OOXdbnD1dhNsu7U5GO+0Ag3C5bJ1SjKXlxeN1NoqxTsHN4XNsxD p5AdXTtxIRkRy/my7o3vj9dbppsWHc/frzoPzjRVL8woHgb9UA5RXJxflkRXVWus46Bc Ij7Vh8RvtkBW2WquNHNJXGZ0zyAdn5k2BkRZbQIYm6R6gCMpWi7RV5Vdw/+SwS/InT7x M58FFNwDjSoGF00YydWGeo4LI4necHD+usFkq3dSqhpn0yJP4fkk5lMa+GtJeBnB8dzE gOig== 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=zN26o4jtAiQFjn/+R1t/+dRnQZzL2loOje0OjCX3wnQ=; b=PxkHKPPdKpd7zhaGmdt+Ljrrn6pX74zfiml/e4QVUF4Ry+aAU7qp3Z2+QtiBdrl9Gk +h3IaBqq3izdbyLfJa63rWYqMVkF8yN8DYyabLbYob6ID1FtKt4U7Q7Qcxgtl0jHitEJ 75102QHRzztxaI1mnwFSETIXDGOCtkeJK4lRwXxexmhGsjwtEZJFjEkyvDEHH97h4HwL jRiqu/NbgZc70QMzREkUWRwdxHmAslXHw93kXeN5BmhtNtOF57WXnsqRTy1t2dWD6T+r ncrU0qAwUR2ECWaaDZmyy1sTLacOJBA4HaAqW3rvsKXaxGz1qih/V4qW5NBK7pILll1b piRg== X-Gm-Message-State: AKGB3mLa5DKrmNJQBpUNEUWyarMPrynFNhq0JlAtLTsvB7MZllgmDJ7H /tzF6jo9glOI2ue7uQGppbQdeQ== X-Google-Smtp-Source: ACJfBouazUHmL5oaytn1qbo83KSTOcz5RpKii+xffINozKb6zLDS6ZzoUqRBMGVCinrCf0DdHbxV8w== X-Received: by 10.98.217.17 with SMTP id s17mr30587581pfg.2.1514423827037; Wed, 27 Dec 2017 17:17:07 -0800 (PST) Received: from localhost.localdomain (c-73-162-13-107.hsd1.ca.comcast.net. [73.162.13.107]) by smtp.gmail.com with ESMTPSA id u81sm71805834pfa.70.2017.12.27.17.17.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 17:17:05 -0800 (PST) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, dvyukov@google.com, ozgur@goosey.org, Tom Herbert Subject: [PATCH RFC 1/2] sock: Add sock_owned_by_user_nocheck Date: Wed, 27 Dec 2017 17:16:34 -0800 Message-Id: <20171228011635.23562-2-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171228011635.23562-1-tom@quantonium.net> References: <20171228011635.23562-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This allows checking socket lock ownership with producing lockdep warnings. Signed-off-by: Tom Herbert --- include/net/sock.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/net/sock.h b/include/net/sock.h index 6c1db823f8b9..66fd3951e6f3 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1515,6 +1515,11 @@ static inline bool sock_owned_by_user(const struct sock *sk) return sk->sk_lock.owned; } +static inline bool sock_owned_by_user_nocheck(const struct sock *sk) +{ + return sk->sk_lock.owned; +} + /* no reclassification while locks are held */ static inline bool sock_allow_reclassification(const struct sock *csk) { From patchwork Thu Dec 28 01:16:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 853288 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="KLc/oHlh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z6WzJ4nTBz9s7g for ; Thu, 28 Dec 2017 12:17:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752859AbdL1BRL (ORCPT ); Wed, 27 Dec 2017 20:17:11 -0500 Received: from mail-pl0-f67.google.com ([209.85.160.67]:45217 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752801AbdL1BRJ (ORCPT ); Wed, 27 Dec 2017 20:17:09 -0500 Received: by mail-pl0-f67.google.com with SMTP id o2so20282555plk.12 for ; Wed, 27 Dec 2017 17:17:09 -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=6+EjW6V+4nFuc4dlrdakJzaTAbCh3oBmQE5rg1uY9is=; b=KLc/oHlhrfQH/B+5k7bhO6eJUPEVX95oAtFZVahiLhxYh1lnesSSEiPI3X0eYM1KSi srtjlP+pmlN2PD8cUx78IwqBsLIMf87YlUiShKvlhF7ZPwPauk9TJRv/t2TBh6DyIx4O MLSO8ghz1Mo+TiW5h4jziEIR/wmj6bKICTLpYU2y5h+X6FbANcc6N479F4ykKTAelE8W BRYEaAXVbXR/qmwiyVt3+YcqkJw7ZcfJmFH/+DsNIbnS2sS2Mt0vied6yBKDX51Os4c+ Ne1wesWNah6WKy35y9tkzlRpRczCd0qyl7RzFBhiJdzWk4tDUEcF/da0XD8v5XVyqkff cC9A== 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=6+EjW6V+4nFuc4dlrdakJzaTAbCh3oBmQE5rg1uY9is=; b=pFLb+6Zvt114azlUEQ70uxw8jeekyfucOuLEif4ACqhR8xZGxjp4uM9T+geJZxMjhD 0XBL1WMyTUaW850HtUg9PDvTpJYxQHT+7v01a4YxnRl7J88hbnAV2FeX6yw0Q6DJhu99 AEa56e8EtF6JLy9ZeRRlFsTfEfo084lYDlrdkfHeotIa5c+Fx9qTDPmTL0+enwc2R0J8 voiYht/3pHYhrOyMSSg/yteXd41YVF6fxVXIszZLvaGo0MbhOiI5Y7zejV7g5FDYI+CI AvXEWZS1PAqeckw6LDAispiC1E/g4m04y9Zsu/qQr+zRo3/KP5jrIQRLchtfZqWfep7P gsTg== X-Gm-Message-State: AKGB3mIVYKN2zdj15+3QYQa/xrnhRmUpacKB/J+hB1M6WxgJcmhTHz5w JD8ZZu6Mx5s0M3U+n5PjO45hkA== X-Google-Smtp-Source: ACJfBougpaKD7iutVKhFdxu2lTWjv0j3sXd4xkWhGB5L9eqrjHe4z8cMK5dVtgaRTeip9HvCd1pj2A== X-Received: by 10.84.179.165 with SMTP id b34mr29968459plc.372.1514423829344; Wed, 27 Dec 2017 17:17:09 -0800 (PST) Received: from localhost.localdomain (c-73-162-13-107.hsd1.ca.comcast.net. [73.162.13.107]) by smtp.gmail.com with ESMTPSA id u81sm71805834pfa.70.2017.12.27.17.17.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 17:17:08 -0800 (PST) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, dvyukov@google.com, ozgur@goosey.org, Tom Herbert Subject: [PATCH RFC 2/2] strparser: Call sock_owned_by_user_nocheck Date: Wed, 27 Dec 2017 17:16:35 -0800 Message-Id: <20171228011635.23562-3-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171228011635.23562-1-tom@quantonium.net> References: <20171228011635.23562-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org strparser wants to check socket ownership without producing any warnings. As indicated by the comment in the code, it is permissible for owned_by_user to return true. Fixes: 43a0c6751a322847 ("strparser: Stream parser for messages") Reported-by: syzbot Signed-off-by: Tom Herbert --- net/strparser/strparser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c index c5fda15ba319..1fdab5c4eda8 100644 --- a/net/strparser/strparser.c +++ b/net/strparser/strparser.c @@ -401,7 +401,7 @@ void strp_data_ready(struct strparser *strp) * allows a thread in BH context to safely check if the process * lock is held. In this case, if the lock is held, queue work. */ - if (sock_owned_by_user(strp->sk)) { + if (sock_owned_by_user_nocheck(strp->sk)) { queue_work(strp_wq, &strp->work); return; }