From patchwork Mon Jun 1 17:54:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 225123 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F236CC433E0 for ; Mon, 1 Jun 2020 17:59:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D3362207D0 for ; Mon, 1 Jun 2020 17:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034363; bh=bEjTjiyU5WTV/mXwc9K1fjyai0srvW0UVwCf1vDtwTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n5M9u4sHAzw96p0j32ArtZCU6n24WZapjlBUF4i8b86B9JZZUWLkavobEI1GWlqOw 4eerG9MoUyWZ+7uXF0hDPzgxVCVxbDum4WUqagZdN/YjMDGrr552mgAg2bklmA3fjx IPD48TSUh07jbarXkwRvb2rqsSVSiGsbszn6PrNk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728659AbgFAR7W (ORCPT ); Mon, 1 Jun 2020 13:59:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:41698 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729323AbgFAR7T (ORCPT ); Mon, 1 Jun 2020 13:59:19 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8C6782073B; Mon, 1 Jun 2020 17:59:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034358; bh=bEjTjiyU5WTV/mXwc9K1fjyai0srvW0UVwCf1vDtwTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lM0bvLXy8InupwOsARN0s7TyibpXnSE2cKOXjvriWodP0K3reXQKlNZagsOqLFpR3 kiIYZgNVdQlw1FyEWmduQzK/wbSNGh4VTOuZeO+JZfic7Fdlcoc65zJFKLmJxF7gE+ MfR4p9Mbcsv5xqQMUuMv8GodZ8MN8klgcN/5FBXM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liam mcbirnie , Roopa Prabhu , "David S. Miller" , Guenter Roeck Subject: [PATCH 4.9 58/61] net: rtnl_configure_link: fix dev flags changes arg to __dev_notify_flags Date: Mon, 1 Jun 2020 19:54:05 +0200 Message-Id: <20200601174022.259672575@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174010.316778377@linuxfoundation.org> References: <20200601174010.316778377@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Roopa Prabhu commit 56a49d7048703f5ffdb84d3a0ee034108fba6850 upstream. This fix addresses https://bugzilla.kernel.org/show_bug.cgi?id=201071 Commit 5025f7f7d506 wrongly relied on __dev_change_flags to notify users of dev flag changes in the case when dev->rtnl_link_state = RTNL_LINK_INITIALIZED. Fix it by indicating flag changes explicitly to __dev_notify_flags. Fixes: 5025f7f7d506 ("rtnetlink: add rtnl_link_state check in rtnl_configure_link") Reported-By: Liam mcbirnie Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- net/core/rtnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2361,7 +2361,7 @@ int rtnl_configure_link(struct net_devic } if (dev->rtnl_link_state == RTNL_LINK_INITIALIZED) { - __dev_notify_flags(dev, old_flags, 0U); + __dev_notify_flags(dev, old_flags, (old_flags ^ dev->flags)); } else { dev->rtnl_link_state = RTNL_LINK_INITIALIZED; __dev_notify_flags(dev, old_flags, ~0U);