From patchwork Sat Feb 23 06:34:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 1047274 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=none (p=none dis=none) header.from=joelfernandes.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="eDCPmLQE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 445z3B1r4fz9sBL for ; Sat, 23 Feb 2019 17:35:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727405AbfBWGex (ORCPT ); Sat, 23 Feb 2019 01:34:53 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:33395 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726646AbfBWGex (ORCPT ); Sat, 23 Feb 2019 01:34:53 -0500 Received: by mail-qt1-f194.google.com with SMTP id z39so5163025qtz.0 for ; Fri, 22 Feb 2019 22:34:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zc6wY8rNCewGZVDgSPtq8BlfOuPURI6nN/IPxD75L4o=; b=eDCPmLQERqkYYc/bGxU7OS66Icgp+XunDLdFECdIPqDGXVeyhvqvuBAhTiXdAR99Dq s+GbkyxtCPFUulsLNPUdRTKGM0yr1m9jKQr9M2WpCmNb5xL1jyylsgvJeD71CIg0p0eu pfWs7ErgnCkoanOoY6gZQxnaRcq5DSWNmDVWg= 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:mime-version:content-transfer-encoding; bh=Zc6wY8rNCewGZVDgSPtq8BlfOuPURI6nN/IPxD75L4o=; b=JkAg+9qAc2wavbdkr3l8hYA9WX7A1RNE9gEBc8n3UxK9Qy7vkJANpaQseBRmO4zmxn /sxdhFa2bTZuLLMXKIzAg3QfaMgNvG/4thsJNT5dp+ITqobPSi8K7Ugf60lrbPRFUbHu pG2iYYPJt9o23KVZgTl6Yi3Q4qD/XUCGFFaDUxBIZ7tRfOUmBqSf+0GIjRbpUX93TjQA LP4ksLPLBEk3tBhhnnyWSitwsNo2RsPClGh1LBjDug0h/6wHj9VS9jLFRCT8fbZo+ccX JqTYE0LO9ZyDBzUJky/rPL1waeMbEpeHvF0raWR/RYVqPDzcK8SMBHgIHtB09TsHgnyB HKiQ== X-Gm-Message-State: AHQUAub5GzbKvI+I2p8SgI1w4uNkcSqcb3Aye73u9Jk3zAtWfKFmYB71 1yzDAdFlaqr3/jGfJxuPLXZS5Q== X-Google-Smtp-Source: AHgI3IYdAZ9LpDlYKNIOJJbI2dWRj2jR/BzqrefjE6BsZ3jOMxDi9AMbLP8ORBFoMg4jKW+d9sv/aQ== X-Received: by 2002:a0c:9802:: with SMTP id c2mr6078462qvd.13.1550903691926; Fri, 22 Feb 2019 22:34:51 -0800 (PST) Received: from joelaf.cam.corp.google.com ([2620:0:1004:1100:cca9:fccc:8667:9bdc]) by smtp.gmail.com with ESMTPSA id d32sm2189408qtc.88.2019.02.22.22.34.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 22:34:50 -0800 (PST) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Alexei Starovoitov , Christian Brauner , Daniel Borkmann , David Ahern , "David S. Miller" , Ingo Molnar , Jakub Kicinski , Jeff Kirsher , Jesper Dangaard Brouer , John Fastabend , Josh Triplett , keescook@chromium.org, kernel-hardening@lists.openwall.com, kernel-team@android.com, Kirill Tkhai , Lai Jiangshan , Martin KaFai Lau , Mathieu Desnoyers , netdev@vger.kernel.org, "Paul E. McKenney" , Peter Zijlstra , Quentin Perret , rcu@vger.kernel.org, Song Liu , Steven Rostedt , Vincent Guittot , xdp-newbies@vger.kernel.org, Yonghong Song Subject: [PATCH v2 1/6] net: rtnetlink: Fix incorrect RCU API usage Date: Sat, 23 Feb 2019 01:34:29 -0500 Message-Id: <20190223063434.6793-2-joel@joelfernandes.org> X-Mailer: git-send-email 2.21.0.rc0.258.g878e2cd30e-goog In-Reply-To: <20190223063434.6793-1-joel@joelfernandes.org> References: <20190223063434.6793-1-joel@joelfernandes.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtnl_register_internal() and rtnl_unregister_all tries to directly dereference an RCU protected pointed outside RCU read side section. While this is Ok to do since a lock is held, let us use the correct API to avoid programmer bugs in the future. This also fixes sparse warnings arising from not using RCU API. net/core/rtnetlink.c:332:13: warning: incorrect type in assignment (different address spaces) net/core/rtnetlink.c:332:13: expected struct rtnl_link **tab net/core/rtnetlink.c:332:13: got struct rtnl_link *[noderef] * Signed-off-by: Joel Fernandes (Google) Reviewed-by: Paul E. McKenney --- net/core/rtnetlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 5ea1bed08ede..98be4b4818a9 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -188,7 +188,7 @@ static int rtnl_register_internal(struct module *owner, msgindex = rtm_msgindex(msgtype); rtnl_lock(); - tab = rtnl_msg_handlers[protocol]; + tab = rtnl_dereference(rtnl_msg_handlers[protocol]); if (tab == NULL) { tab = kcalloc(RTM_NR_MSGTYPES, sizeof(void *), GFP_KERNEL); if (!tab) @@ -329,7 +329,7 @@ void rtnl_unregister_all(int protocol) BUG_ON(protocol < 0 || protocol > RTNL_FAMILY_MAX); rtnl_lock(); - tab = rtnl_msg_handlers[protocol]; + tab = rtnl_dereference(rtnl_msg_handlers[protocol]); if (!tab) { rtnl_unlock(); return;