From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7E9DC4167D for ; Mon, 15 Nov 2021 23:47:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C624363277 for ; Mon, 15 Nov 2021 23:47:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356235AbhKOXtb (ORCPT ); Mon, 15 Nov 2021 18:49:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:45220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344185AbhKOTYD (ORCPT ); Mon, 15 Nov 2021 14:24:03 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6CA4E63478; Mon, 15 Nov 2021 18:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637002400; bh=k1kcdyPnokAmjTWnwFNtH05VwvYs8bm4sjIfymJgdnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sFFZAvyTLFMilY1GGrZ5q4HqDugMnuUCPc3zOIdNWpvaSpi8tnJ6yyuRcrav5fswE GvTPkCbv1YFHxFzUq0CmZd2BoR2FC6NVIh1YEi+8QDE1DdwXzII5OfREMLDjA0nhW+ ul5SDiq3my5AJVpQdLoz85QwLT98NkEv4o4h2pH8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Henrik Bjoernlund , Ivan Vecera , Nikolay Aleksandrov , "David S. Miller" , Sasha Levin Subject: [PATCH 5.15 551/917] net: bridge: fix uninitialized variables when BRIDGE_CFM is disabled Date: Mon, 15 Nov 2021 18:00:46 +0100 Message-Id: <20211115165447.466323240@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@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: Ivan Vecera [ Upstream commit 829e050eea69c7442441b714b6f5b339b5b8c367 ] Function br_get_link_af_size_filtered() calls br_cfm_{,peer}_mep_count() that return a count. When BRIDGE_CFM is not enabled these functions simply return -EOPNOTSUPP but do not modify count parameter and calling function then works with uninitialized variables. Modify these inline functions to return zero in count parameter. Fixes: b6d0425b816e ("bridge: cfm: Netlink Notifications.") Cc: Henrik Bjoernlund Signed-off-by: Ivan Vecera Acked-by: Nikolay Aleksandrov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/bridge/br_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 37ca76406f1e8..fd5e7e74573ce 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -1911,11 +1911,13 @@ static inline int br_cfm_status_fill_info(struct sk_buff *skb, static inline int br_cfm_mep_count(struct net_bridge *br, u32 *count) { + *count = 0; return -EOPNOTSUPP; } static inline int br_cfm_peer_mep_count(struct net_bridge *br, u32 *count) { + *count = 0; return -EOPNOTSUPP; } #endif -- 2.33.0