Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp6758346rwn; Tue, 13 Sep 2022 08:38:19 -0700 (PDT) X-Google-Smtp-Source: AA6agR42kA461CQ6EGk4viGulddRosdWOOeTAgM/R2VqIrhEcSdauPnOh1WEtonrg97X44/ugfbD X-Received: by 2002:a05:6402:27c8:b0:451:440a:2f48 with SMTP id c8-20020a05640227c800b00451440a2f48mr13962018ede.1.1663083498984; Tue, 13 Sep 2022 08:38:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663083498; cv=none; d=google.com; s=arc-20160816; b=kIRHVsDEkheJ3+GYcsOAXG57IV2xoOsv9r4QKCcokrfA1O/QYN8L8n/lYKPK5OAtiF dHRzW+Qyt13wuqKvX7qTr0R/iXhHcG7RFvM0jI/v0RJq0Gm9wMMvDd9EcF8iTSFSFM7A Rz6WORuL/I4RpY3iPCiqf24uKQN37cRhDZ1J+yV0A05GQD23g2hry6MJ4W34kRYUrRJF +yM5fQLW2pxBSRXQVVVpTQiV7/lMRMtRUhj9JI3oY5qAQzqpEyLi96UDgQy/8O+KsCxa ZMoyGnCmOaMuGBuH+uiIJnlXm3lu1ei/vaEa2gmpfnPrwmWqgxrdWeNXTm9zv51nNkbx RI6g== 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=Pfq7kHSm80LmcypIa+f7zQ/FRH2m5IS2HceOO6DXUBo=; b=QhsxLcYrsSIyffUw9BWbVwZHu25/YEwvFgF6tY0V8YjU7A3qMFsoPj3LSbQiQ5fOl5 AHP5oZkwcSRaptYwEzuxqmBQy35VozjPI1DyNxzr2NpMbXW79OOV4el5bq6ZqY+epUC8 mCNhiugo5ehfMNhG0bOlGrEG7VyReF602L7/YgZZ25mDmFIk1RK0WjzGMew1apc0rjsX u+Ab9CwQNrHdvEaNFOeqnS4dKTmWF9tcRn0OH9ZNuyikB4eDdH8skU0Qhfx8IYZuWONg Pb6OffO7WTYMOaqlXm8VEMeV+skUKham7H7Tqne25d5GviEXINCpr5lu9jjhGvo+rfSi d/4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Q/sqWD5O"; 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 qw10-20020a1709066a0a00b0073d6b849d4fsi11533389ejc.731.2022.09.13.08.37.51; Tue, 13 Sep 2022 08:38: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="Q/sqWD5O"; 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 S233288AbiIMOwq (ORCPT + 99 others); Tue, 13 Sep 2022 10:52:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234627AbiIMOtR (ORCPT ); Tue, 13 Sep 2022 10:49:17 -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 D65DF7173D; Tue, 13 Sep 2022 07:25:47 -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 96941B80F3B; Tue, 13 Sep 2022 14:25:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0998FC433B5; Tue, 13 Sep 2022 14:25:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663079129; bh=PIiYXnLiCDUyEahvFa6chU1F97LMMd7JzaS5JBKy+7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q/sqWD5OlDWzL4/+D3nRdmc5mbs5y+BjmflpwKtOYBKC6FUpkyGwfhqN8LmLBXqOH LStA8kxVsFw+1/BUw439+F5xVXWHFICVegaXRjM2WeIAOPwQ7bFKxtPa/GF1HtW4/F kL53/X/ec9YiQG8wF3bZsNKNFbZXlPPP6vL1l7sQ= 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.4 015/108] ethernet: rocker: fix sleep in atomic context bug in neigh_timer_handler Date: Tue, 13 Sep 2022 16:05:46 +0200 Message-Id: <20220913140354.224497389@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140353.549108748@linuxfoundation.org> References: <20220913140353.549108748@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 8157666209798..e4d919de7e3fc 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