Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp6849727rwn; Tue, 13 Sep 2022 09:49:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM61gT2VIdaGNzb1Lj3v6N3Lr8//U4wnCeJJSqFGjwb+SkC0lovycRYrR6MMusz8ZHU4Sj2l X-Received: by 2002:a17:90a:d149:b0:1fb:6dfb:1fb8 with SMTP id t9-20020a17090ad14900b001fb6dfb1fb8mr179161pjw.25.1663087758628; Tue, 13 Sep 2022 09:49:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663087758; cv=none; d=google.com; s=arc-20160816; b=fCTi9P5GK7NGTDTFghq+8/OGGy28A8/fQNpIxDvxlHQnYkyDg+rKA4e1BcbWel7M/G JlSRImcJnEYVVZ91mYj+NPqihyevbGfDzedPtYsJf3B+31WiB0rQcjveNloQgykjca9J v/KDt/zKQ4W/OmC7cjSj/f6lULdWrzquNIMywPZm0MFpYgzZshYnEanRO0jISkkG+zLl ovUufMzZjjfsRB84gONKMmj+OGTKVIXDHmsh1qXXSGpb4A+KEqy9sbFown2Vl4CoCIHm gyVFXBM04npGz2NWlIcku+OEwQe38kCvOZJBe9ns3Rk8KjXUwsBncgZ58bz9+TjKTWeG lU6w== 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=B853A/P9n4e4Ic0SgS6MoCjagqVwM9YJx93cXNunbuU=; b=HPaBj59AZGKtYNasvrwPgHB4JNHJncmF054LUHianKE4XZyGy6xANoqDTRI5MCyZz0 6SV8ie8T3e/bzMqLh+l2sZwSs5bNUGMgOmmkfYgI+aFkqqPfVXQJxe9KC5XXttWswYQm lNrnM40MsOPNqtTCP8/mojmAOxgCgv0vwxziqjUpgf1JAmKfTFJsvWEOM1KFWakbo69V O+eKBBjYaRnTMadOTSMrLFCpVL7PDjpnMX1BIg6O1IZS49yKTs0M7MQUWVgoPf6pp4oO V6vR0eP/5Rih2bRtqCkD3Tl5XyJRzCJ6shJ51jb/cVcmA/GlJYGZ8xakRT6Ci1cLiLG+ qYfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qw0qJYEy; 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 l191-20020a6391c8000000b00438b25c09a3si11899687pge.287.2022.09.13.09.49.04; Tue, 13 Sep 2022 09:49:18 -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=qw0qJYEy; 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 S231743AbiIMPVT (ORCPT + 99 others); Tue, 13 Sep 2022 11:21:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235782AbiIMPTW (ORCPT ); Tue, 13 Sep 2022 11:19:22 -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 33E337AC37; Tue, 13 Sep 2022 07:36:08 -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 5DA43B80F9D; Tue, 13 Sep 2022 14:34:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A263FC433C1; Tue, 13 Sep 2022 14:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663079661; bh=fl+1UOIJlFEE2wyNt2W4lBZHymVKH/kugNQe66C4Z6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qw0qJYEyS/kEYm8morrU2ImrdBBQJeOI4dcoigJHY3AIN3ysKukEg0QjJG+V+WWb3 Z3eHrYpAyNAcOb5CQ/hVg/LKQwM+WiqR4k8GkYpvp+B23I1v9D/XgXJcx4f31e5gID Ss+9f+m4hKSKyOS4xEv1ZpN7rNZ8lvbHFNl4L3hM= 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 4.14 07/61] ethernet: rocker: fix sleep in atomic context bug in neigh_timer_handler Date: Tue, 13 Sep 2022 16:07:09 +0200 Message-Id: <20220913140346.835357179@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140346.422813036@linuxfoundation.org> References: <20220913140346.422813036@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 0653b70723a34..5dad40257e12e 100644 --- a/drivers/net/ethernet/rocker/rocker_ofdpa.c +++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c @@ -1277,7 +1277,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