Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3023049pxb; Mon, 18 Oct 2021 06:48:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoPa4Sx5JO0qGfHr4wQWxws76r6KC9bWWQm3KG4ytzr3Ny/HX7qVaSIXZsdGopvfMfJUeD X-Received: by 2002:a62:7a8b:0:b0:44d:47e2:99bf with SMTP id v133-20020a627a8b000000b0044d47e299bfmr28113648pfc.64.1634564889187; Mon, 18 Oct 2021 06:48:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634564889; cv=none; d=google.com; s=arc-20160816; b=YILWgcLqZ1NVL6G7U5Q0peYX0A9gHWN2eplM70ksgpz+9O6DckdbptQ0v8N1VuPhcU /6na98niC28i2JW+sUVqhiOnrrVri2QKy4pq5tewin7TCUSCfr73g1aituDmmVDx0QJl Y0Ot8sAAPWBAiG0pcG3SZzmXuwv4rxiP+2K9spGMcz+QBuQR+4tbtb3n/B0KJbjbXXGp 1grD6PlSUDT2lmW5YfDQ1H5F6HNGl4u8K6grxiNunpitzY37mPPQlvVjEwO43T2/XwE8 1/Qeu+putoqR6ms28aDu7EL5wR+5bl2PM8ecnVSJeRovpr2njRrgMGAMQzkQNwESan9C +s0A== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hHLbxuHgCb325Z4ph6NhV5V+2F+wCS5sLq3dg2n9+Pw=; b=prJyRJNPG05zmiVstUNldXDi0viuaH5OJHS6TMIfjATS9c9O9ZZY2XICqAlvBqKrpJ dflKkBKJwkAaqB7JSZGcEl4JG9jN6EJE2mQnFCgotRQ7GtBMZ30Nani8R1cc4TRChgzu OHqWkpkKbNohwKbgb7xW6IiRN9keUJLodcn0kgk6IFZ80UZjcUfgLyxGc7zazewamTh+ gUoVo7DZcI2jM5ss9jZPxTNy3PfPD0XF7iprT2FcjxWvUyPviyNuLvYC4nyc3wb3mbRR +jpxJAE7n2i0FfbkccMBCr7UJDqyNBBIE27NFtfU0yqExtzw7Fxm4V5QPy5dWcgkcUkH Y+Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NYnqO7QB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w9si23249318pfu.292.2021.10.18.06.47.56; Mon, 18 Oct 2021 06:48:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NYnqO7QB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233480AbhJRNrk (ORCPT + 99 others); Mon, 18 Oct 2021 09:47:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:38242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232859AbhJRNpj (ORCPT ); Mon, 18 Oct 2021 09:45:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BF5D06139F; Mon, 18 Oct 2021 13:35:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1634564131; bh=Gijh4/azG3D1JIl0RNNZdK5tf0tdX3TawZnvTamqQNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NYnqO7QBxM9f5Pdjl/4iUhI2yJQhMQyJcVETkuEnzXiFXjjGvaGvn0RdYGWKh9I1l TVI40LLHaIWt0kbWHy+LI7UrIwJtqaYTv/mfpbEEjIU+hD0ZfyRXkHGT+RU8OqT1IH TMM5fSVisfXSN6n5B7IcqecapdSe5KKGlSx85J6E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arun Ramadoss , "David S. Miller" Subject: [PATCH 5.10 075/103] net: dsa: microchip: Added the condition for scheduling ksz_mib_read_work Date: Mon, 18 Oct 2021 15:24:51 +0200 Message-Id: <20211018132337.275843701@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211018132334.702559133@linuxfoundation.org> References: <20211018132334.702559133@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arun Ramadoss commit ef1100ef20f29aec4e62abeccdb5bdbebba1e378 upstream. When the ksz module is installed and removed using rmmod, kernel crashes with null pointer dereferrence error. During rmmod, ksz_switch_remove function tries to cancel the mib_read_workqueue using cancel_delayed_work_sync routine and unregister switch from dsa. During dsa_unregister_switch it calls ksz_mac_link_down, which in turn reschedules the workqueue since mib_interval is non-zero. Due to which queue executed after mib_interval and it tries to access dp->slave. But the slave is unregistered in the ksz_switch_remove function. Hence kernel crashes. To avoid this crash, before canceling the workqueue, resetted the mib_interval to 0. v1 -> v2: -Removed the if condition in ksz_mib_read_work Fixes: 469b390e1ba3 ("net: dsa: microchip: use delayed_work instead of timer + work") Signed-off-by: Arun Ramadoss Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/microchip/ksz_common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -460,8 +460,10 @@ EXPORT_SYMBOL(ksz_switch_register); void ksz_switch_remove(struct ksz_device *dev) { /* timer started */ - if (dev->mib_read_interval) + if (dev->mib_read_interval) { + dev->mib_read_interval = 0; cancel_delayed_work_sync(&dev->mib_read); + } dev->dev_ops->exit(dev); dsa_unregister_switch(dev->ds);