From patchwork Sat Dec 23 17:17:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 852677 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="nUxs+VoB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z3sX343K4z9s7f for ; Sun, 24 Dec 2017 04:17:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757109AbdLWRRq (ORCPT ); Sat, 23 Dec 2017 12:17:46 -0500 Received: from mail-pl0-f67.google.com ([209.85.160.67]:43859 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752857AbdLWRRo (ORCPT ); Sat, 23 Dec 2017 12:17:44 -0500 Received: by mail-pl0-f67.google.com with SMTP id z5so14612916plo.10 for ; Sat, 23 Dec 2017 09:17:44 -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=nUxs+VoBobyqESbzYUyDX/bkjHPq/ppiH1Yeb4E15D3iPHENMXMomOUgL/ngSWqAKi 0h8sYNSX+Gg/5R8hhb5ZZFK2H2r06PQxHJG3fGAwvMSeXz6JKym7JblY9vOYRd+ArPU+ 2YKrNlGO95kw2jLG2AIGoJWpIu8wTfo3901BtkutldaFcxJutAjNGdnSuRRejVQmkUAz Im+6SnxlxQSuaJhocOS37XrH2DmblA9vE+mZ2hYlA4DLUU8FVkYWo0/+IggV8fy6iyMq HrOlqFRZRLuC6NvN4L3pCx0ImkomXnXvsc1RwFMubgsyi8NyOPZ/VGfy1vteN3GphHa5 SOCA== 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=MGj6poj7n/aSRhuDomw7M347hIGqZIGK+GU1cOl5oxtLVIlIGWm0c+oBM2m7Xf1qM0 I3/J0VqgxoYXuB+Wy/lMhcD8B6cNYogpHCxQ9BXkszJo67tvBkv918ItMnseifjb24DG 4jhRpoyfHjiinnu+PLTtTtTbXqTDSuueE4DFeTlhhGilGv6SGyUGVIOv29WFFFouGoZs EuEqU+7ZRaoj+gDJLHtzWOAVqK7SQILBGs8FiD9wdNKJiReHvO3ro21prP6sLLOLzgv9 XFJ9EiO0fahvni5IPrYyrJfolhzIRgNiiDCXnsJWftLuBciAeCrzZizSGSUHsnTSe5E4 aoVA== X-Gm-Message-State: AKGB3mK/ZZiGf6434WXodsKDnUgPkblOO/Z+d8V4RBCqTNkruOjWijpC mHpJbTTV90G4qbmQAkR/aIhdQQ== X-Google-Smtp-Source: ACJfBosx7yMIeiAhgfH8upKxTSvXVQ7RAaJAIPjKr5l6iko6232palqyQQIDwuiQRdfZdlXTDEgflQ== X-Received: by 10.84.135.101 with SMTP id 92mr18496319pli.172.1514049464282; Sat, 23 Dec 2017 09:17:44 -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 o84sm53446109pfa.46.2017.12.23.09.17.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Dec 2017 09:17:43 -0800 (PST) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, dvyukov@google.com, rohit@quantonium.net, Tom Herbert Subject: [PATCH v2 net-next 1/2] sock: Add sock_owned_by_user_nocheck Date: Sat, 23 Dec 2017 09:17:15 -0800 Message-Id: <20171223171716.16130-2-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171223171716.16130-1-tom@quantonium.net> References: <20171223171716.16130-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 Sat Dec 23 17:17:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 852678 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="xbNqv3nR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z3sX42ds7z9s7n for ; Sun, 24 Dec 2017 04:17:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757249AbdLWRRu (ORCPT ); Sat, 23 Dec 2017 12:17:50 -0500 Received: from mail-pl0-f65.google.com ([209.85.160.65]:40820 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757119AbdLWRRr (ORCPT ); Sat, 23 Dec 2017 12:17:47 -0500 Received: by mail-pl0-f65.google.com with SMTP id 62so13169317pld.7 for ; Sat, 23 Dec 2017 09:17:47 -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=xbNqv3nRxdBa4RpIp1+s4iTixd4+VN2taFwlHiiMZVZ0xpHSkYP3nBZk9VXEfDANjR 52IlUEbXCs+nMbfJYUnn09J0wHSbi7ccI8hpzqSQ7mAMJWJzzXlPJaF8zyD9rVAT8sMZ 1XathXhJYn6OAFjo0SzQHlr4c0pBMsGstryS1Jnkfd56YnvL7dyfJVv2Z45ddb9eHxfE FWQMhnAsAJWL7DIhzoyeOr0CRzQUTd16sHmLt69Gf+d1akIT33KgAWSjuP+58PrSUIC/ L44dmVeMrorVKOjTQ8pjHvXT5oEgwU4lnU2gSd+BxKUQttxmi3EP9gav2R8Zx/xEj67a wxYQ== 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=rHJq6SzAFhH7bzXJVHP+5Qqaq6EZ5uvTyxl6c8Y/vv6XnPxzihobIq2+ze3Qf9Eq06 kUeSDg78A/l1XbnUxUG0IPNwEjTyqUW/RZFj2krM6+EoBDGWuZVMct0FDxQS6C1kMO7/ cYmV+CYg99tt0Y2k/M6KlRRK0Aw/ARQ3TJgSmCBzf/P0ckuqraJiWjHv0Gf6p63kpMat S4Zzr4BoO/oH1kkETuYsvZHIghHxmYxcIMMKMQVKbfXO64tijqpTipNjrJ2rK2u3Yd3H UkX3IMv5LuZBzBPgeuzZIQQvgnoD3aJs6XvrqR86xxb5lZ8KsueRlzBNZq2X0Q+cwczj kA0A== X-Gm-Message-State: AKGB3mIs4mv0nippPLfSzpyDVZtKtP8tJdwBXKLp80iyUpBJbcYw8Rud htf37almUN/TDlCVbMD1O4c9DA== X-Google-Smtp-Source: ACJfBotjU6ls85cXH6QkZpfobWBJS5mAaC1mXJY/1BBiIWVFUmvyZfXizcMxNOMCPl8CxJM+xDMnTg== X-Received: by 10.84.197.3 with SMTP id m3mr18258470pld.264.1514049466654; Sat, 23 Dec 2017 09:17:46 -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 o84sm53446109pfa.46.2017.12.23.09.17.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Dec 2017 09:17:45 -0800 (PST) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, dvyukov@google.com, rohit@quantonium.net, Tom Herbert Subject: [PATCH v2 net-next 2/2] strparser: Call sock_owned_by_user_nocheck Date: Sat, 23 Dec 2017 09:17:16 -0800 Message-Id: <20171223171716.16130-3-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171223171716.16130-1-tom@quantonium.net> References: <20171223171716.16130-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; }