Received: by 2002:a05:6358:bb9e:b0:b9:5105:a5b4 with SMTP id df30csp4524766rwb; Tue, 6 Sep 2022 08:41:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR60umULyFEi8diW+zZqGE44fqWJce2V/i3TsYRfFiHt6thXPSc1p6GipmTm3Qj31SmfEHz4 X-Received: by 2002:a63:2048:0:b0:41c:daad:450d with SMTP id r8-20020a632048000000b0041cdaad450dmr45618348pgm.240.1662478863808; Tue, 06 Sep 2022 08:41:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662478863; cv=none; d=google.com; s=arc-20160816; b=WSQ6StlUItGUbLA/dPy022xNnzqXyzM3slAYsa512/5iyI/4DykSBZ+MIWwS4WkRs0 WdVnelcDJ9l0dykjKZT9M4ydqwzetfkZoDo84faig/i2HoURUOGk/TPG89COVon3Lw9V nrwNPEdwzoUIdT9KbZ5rP/WI4DlDuKOhMzUvFvx6LvtKrKuAFxptP7sh4wdresU3dL5p O/2biOjcSyhjZZuBXcOBPjUtoT3sUOS9vngcYnhbF84RcsZgJkuOX2psh4cEet+1eewl nLd7u8nKJP6AF/beFKmZjFzUpCF85NBEq7h9fiQA0w7ecGt2Y/iG0VR6dW/8rHSFjvGH FOog== 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=/9S+llWD7fGT7wYLH2BZyzTzoO3dOwahMZBtjUtJdoc=; b=vbDYyfqTDO+C+C8eLcvZNHrIkkPQCH0lxBvSkzwsx/tfmZX3XA2inYj/xHdc43jkbL 7v8QJ0f0tZoZ5mHtj89PsFBl8DesglUyhtzJxpBAaQ42dEriIA8q6P+Dh0wMsmUgvFd+ YlhiT/clAN/uQTKLFQSdbSXaiKvVXfaDx8hGKz47TKxuTLCZ3PCDIiJoJPlZ2Zfbv4Zg lbHd5+NUuQklZ52G8ZmMhBoej+OgNYpKGwsGYf+aJH2skQWhypzi0+7iiPdhzPrNbf0q dE4qpiKBHhLJu4jsN4uY7RBEbNFTvB8KDXcdogCAwUvwP57Ll/FbZWXOacCEvlAldVIP 6Fkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=e+GePET5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rj5-20020a17090b3e8500b001ed40b70436si14938384pjb.155.2022.09.06.08.40.51; Tue, 06 Sep 2022 08:41:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=e+GePET5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S233956AbiIFNmO (ORCPT + 99 others); Tue, 6 Sep 2022 09:42:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233569AbiIFNko (ORCPT ); Tue, 6 Sep 2022 09:40:44 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D4E7BA9; Tue, 6 Sep 2022 06:37:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5257CB818C4; Tue, 6 Sep 2022 13:37:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B46C8C433B5; Tue, 6 Sep 2022 13:37:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662471430; bh=9No5lsAw1e6KnJpCa7Pr5sdzACoA6tGPj7TyNWrBArQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e+GePET52dZaD2yTLGG40/lSft+89mWKCqjp9Tv1GHUoV01pcnEXecUgC9jKZCzGE ErJ9krChEhRJRueDcf4k0Y/miNe60D6AglDSUK90IKDwHJLxzFG6eV9HHXvGo845lg GsGvhn8YSoM8wkgWgl92/YBtPJ064BQfBdexmXvw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Duoming Zhou , "David S. Miller" , Sasha Levin Subject: [PATCH 5.15 023/107] ethernet: rocker: fix sleep in atomic context bug in neigh_timer_handler Date: Tue, 6 Sep 2022 15:30:04 +0200 Message-Id: <20220906132822.748284322@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220906132821.713989422@linuxfoundation.org> References: <20220906132821.713989422@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Duoming Zhou [ Upstream commit c0955bf957be4bead01fae1d791476260da7325d ] The function neigh_timer_handler() is a timer handler that runs in an atomic context. When used by rocker, neigh_timer_handler() calls "kzalloc(.., GFP_KERNEL)" that may sleep. As a result, the sleep in atomic context bug will happen. One of the processes is shown below: ofdpa_fib4_add() ... neigh_add_timer() (wait a timer) neigh_timer_handler() neigh_release() neigh_destroy() rocker_port_neigh_destroy() rocker_world_port_neigh_destroy() ofdpa_port_neigh_destroy() ofdpa_port_ipv4_neigh() kzalloc(sizeof(.., GFP_KERNEL) //may sleep This patch changes the gfp_t parameter of kzalloc() from GFP_KERNEL to GFP_ATOMIC in order to mitigate the bug. Fixes: 00fc0c51e35b ("rocker: Change world_ops API and implementation to be switchdev independant") Signed-off-by: Duoming Zhou Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/rocker/rocker_ofdpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c index bc70c6abd6a5b..58cf7cc54f408 100644 --- a/drivers/net/ethernet/rocker/rocker_ofdpa.c +++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c @@ -1273,7 +1273,7 @@ static int ofdpa_port_ipv4_neigh(struct ofdpa_port *ofdpa_port, bool removing; int err = 0; - entry = kzalloc(sizeof(*entry), GFP_KERNEL); + entry = kzalloc(sizeof(*entry), GFP_ATOMIC); if (!entry) return -ENOMEM; -- 2.35.1