Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp428755pxj; Wed, 2 Jun 2021 02:44:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhcVMfqIjiLQZkdpFDQwkELZFTCRQxDY17ONsJdmyaclu6k23tZsxEOzDJEe3svsheGSOe X-Received: by 2002:a17:906:3ce:: with SMTP id c14mr21690666eja.426.1622627081108; Wed, 02 Jun 2021 02:44:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622627081; cv=none; d=google.com; s=arc-20160816; b=VauutrLo8OtDNF8+2fzfqbq6J4JttXWhGkNWuAGKCpoX8sQx39u3sQhGDtlJgpMChM w2gLGVOUHN3Jm3yO3HfdypI/tvFScp7wqUTU0hfP4owHfg1ZsexO+TR5Qjn1QuBd1b97 NtFrnm+PALw8N2KtAu4zrm8ZCzy7vNtXHMQHhQaUV2ve9vIRMZnFxU7xaLATsd6ebeH0 sXWuCTg7KHcSfQNSE+NY3ttzWaRBvovXID3ZdIYaLVUtFfkanv4wWtSlo+ZTe6VQtMh0 KXsCuVsCDb3UVDDOa374LS3BxdSiWR9wM2F2pydWE4GSsG+11Gswe2vRTl5kxVblaHsU CfHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=QCzVRV8L1fbtMtlNRd+CuhFKPjnvGS4FczJfnNNp23s=; b=Y03zh/hTYCurP8x+vFaIQOZMydIiDhZ2ADF7QFDLHAmwrppTxzLcLJ8oM2CwZgwyua dMNsIDRzzNJwWi55nBBH3LuQ+P6k4VHXTOurACUi5oz2ybleqs5bI91Sy1sWkA9vstiA 3fY4qeVzNPMK1Is7iwnfpfSYh4scW+yCDz+3lrJehifFv9v00grHUnObJTBGfME+sJva uDI7F9PVvb2RFhFnhdsH/MQXFLpi8b4CWSpoq8UzCeCVgOswOBY4CADK2qKbEceTid5d hX6LKLhuhW64cRdNyXWKfPVBUWd7LSmTwCaadlglAFiPf6dwZwI3xnt5Kk56XQWQwPR7 w0GQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e1si1537549edk.506.2021.06.02.02.44.16; Wed, 02 Jun 2021 02:44:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232588AbhFBIaa (ORCPT + 99 others); Wed, 2 Jun 2021 04:30:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232575AbhFBIa3 (ORCPT ); Wed, 2 Jun 2021 04:30:29 -0400 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:191:4433::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A22FC061574; Wed, 2 Jun 2021 01:28:46 -0700 (PDT) Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1loMF2-000xxd-0U; Wed, 02 Jun 2021 10:28:44 +0200 From: Johannes Berg To: linux-wireless@vger.kernel.org, netdev@vger.kernel.org Cc: m.chetan.kumar@intel.com, loic.poulain@linaro.org, Johannes Berg Subject: [RFC v2 1/5] iosm: fix stats and RCU bugs in RX Date: Wed, 2 Jun 2021 10:28:36 +0200 Message-Id: <20210602102653.48d067d87f3e.I53608f5de5828db7066d29e5774bcf8a19e0f642@changeid> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210602082840.85828-1-johannes@sipsolutions.net> References: <20210602082840.85828-1-johannes@sipsolutions.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg Signed-off-by: Johannes Berg --- drivers/net/wwan/iosm/iosm_ipc_wwan.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/net/wwan/iosm/iosm_ipc_wwan.c b/drivers/net/wwan/iosm/iosm_ipc_wwan.c index 02c35bc86674..719c88d9b2e9 100644 --- a/drivers/net/wwan/iosm/iosm_ipc_wwan.c +++ b/drivers/net/wwan/iosm/iosm_ipc_wwan.c @@ -312,7 +312,8 @@ int ipc_wwan_receive(struct iosm_wwan *ipc_wwan, struct sk_buff *skb_arg, bool dss, int if_id) { struct sk_buff *skb = skb_arg; - struct net_device_stats stats; + struct net_device_stats *stats; + struct iosm_net_link *priv; int ret; if ((skb->data[0] & IOSM_IP_TYPE_MASK) == IOSM_IP_TYPE_IPV4) @@ -325,19 +326,27 @@ int ipc_wwan_receive(struct iosm_wwan *ipc_wwan, struct sk_buff *skb_arg, if (if_id < (IP_MUX_SESSION_START - 1) || if_id > (IP_MUX_SESSION_END - 1)) { - dev_kfree_skb(skb); - return -EINVAL; + ret = -EINVAL; + goto free; } rcu_read_lock(); - skb->dev = rcu_dereference(ipc_wwan->sub_netlist[if_id])->netdev; - stats = rcu_dereference(ipc_wwan->sub_netlist[if_id])->netdev->stats; - stats.rx_packets++; - stats.rx_bytes += skb->len; + priv = rcu_dereference(ipc_wwan->sub_netlist[if_id]); + if (!priv) { + ret = -EINVAL; + goto unlock; + } + skb->dev = priv->netdev; + stats = &priv->netdev->stats; + stats->rx_packets++; + stats->rx_bytes += skb->len; ret = netif_rx(skb); + skb = NULL; +unlock: rcu_read_unlock(); - +free: + dev_kfree_skb(skb); return ret; } -- 2.31.1