Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3436414ybt; Tue, 23 Jun 2020 02:11:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJo8XdwU9yRtwcKam/Kjco6axUch5kIgKfQJDs17I/zruGe3Y2md9B4LwAfkjjEBFYDBfK X-Received: by 2002:a17:906:fb14:: with SMTP id lz20mr11326140ejb.217.1592903466957; Tue, 23 Jun 2020 02:11:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592903466; cv=none; d=google.com; s=arc-20160816; b=c40ipzb5uul2QzcErXcQc4CPcy2KUmT/FOvvZwmKxqZcBsahpk8Y3Pj3wMi1x4aAcs WAksx60oxGyGsJj5lnC2VlJVYlP1DdDVlF20X86i63I1vRwsyop/C1xeRSkr/XMVIFiy 8f0ptWNTbVAcChXTApF+VGjdaBO7ekhXW/OAWtfiD511zSao+cCij75n36nWeCyRBAaI wkEN/gu4liPQ8BHc67pdDpbTqIwhsBzNhYXkmHA1IqrPo0KSYx3iLCokHo7cruItIEMf IvQra2NrOWVy/whNBYRQ+gGTLViwrkxiQYH5nG3qFKCH4WXdf1TPKSkF+VK2j9nI17FW zkxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:dkim-signature; bh=IY2q8oZaTQfbu1pwkC1ktrEFc9JmStyYjKkgcWZLv90=; b=o0qKXkhFFsfg3eu7cc4c3BPug14YPs6fRPxhLOUbg5SWNdBUGzYSOGTcDq7U/Q0JHx G5h+Uo/Nvai+Z1H4SwQzBvs+TVu9xfAtHsKjHqFh5NMYVjVSCPMdjkXAYAsZBd6v14JP WF8BMkKNNk5tQCSSyII4gmIflQiCj0E8vNSm6KmBJ5HPBX8g5hzhzZnE9Xy1XKqlShNd AYVrUsjQIX7QeIa6SvsYvuSWyH2ZH7yYEb9yng87wcLSfz+z0+yBCeWi1F+k0VOEq0EK N8dS6r87q7atQlOOL+iGz6/YtqnjFlk4xy+w03AcT5qvlV9//DbBB4QEJuOhJhm97tMk vy8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=hAg3TKcx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d21si4172159eja.703.2020.06.23.02.10.44; Tue, 23 Jun 2020 02:11:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=hAg3TKcx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732248AbgFWJIq (ORCPT + 99 others); Tue, 23 Jun 2020 05:08:46 -0400 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:49195 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731860AbgFWJIn (ORCPT ); Tue, 23 Jun 2020 05:08:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1592903323; x=1624439323; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Vab59iB18cUXfZdY2UKkw5U/rizieclL7eIH6pZwzYE=; b=hAg3TKcxMgMtv6DFI+R0/Cpr52TsR2tJcnKylFGme43BmX16OMNRNoYa bDuYT/NQyg8BslBtfPipgjyIeqh0tZlnadXM3nMVYThNPf/ihcA8QQVbX 7/QAPA7RsDXZHHblujxAGysdeiWERtc74E3qdozhkHrG+lbxCsDN0cZi9 BdTVvWnNHYzmi3EMHsZIFaGsLYh0iS0PL2yjAR4XnExagnKKx2hNG6osC 3mp5igljac3FvjoQow5rA/SrcuBbJDae/41DwrSYuVf//Zjhf2nRUttuS tikSc7TsosxF5/Mg46kajiWzppWBckBEjx8teDabzeg9E4D9VvlPVqp1e w==; IronPort-SDR: At4OI2cnKjuQjIQHDaHNMhMYRBKgl5PtZezd8g1/i78LKxmOMm5XU3JW9P1KkqZdpvtsqjANK+ IRy5ZsEhUkMeRf+NNSaeV2iZUoETw1Yj7fsCfpFwxfY20st4c4K6KkQKbfBWeSEyec4QOxhQzO NI9JkgLQCWogzuxwfeAGHsQiIhFkyvzkFTY1+wn9iMTfpQ2MsDRBzMBggM9k4R8CAtd18M/H4S oTpeNYe/wgcAIQAopoDKhsn10yVXPsnZhB+ab42jP3eJFnSHUVAT4HNGGXxkc+SYTS7POjdg/l A7A= X-IronPort-AV: E=Sophos;i="5.75,270,1589266800"; d="scan'208";a="79436711" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 23 Jun 2020 02:08:42 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 23 Jun 2020 02:08:31 -0700 Received: from soft-dev3.localdomain (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Tue, 23 Jun 2020 02:08:40 -0700 From: Horatiu Vultur To: , , , , , , , CC: Horatiu Vultur Subject: [PATCH net v2 2/2] bridge: mrp: Validate when setting the port role Date: Tue, 23 Jun 2020 11:05:41 +0200 Message-ID: <20200623090541.2964760-3-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200623090541.2964760-1-horatiu.vultur@microchip.com> References: <20200623090541.2964760-1-horatiu.vultur@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds specific checks for primary(0x0) and secondary(0x1) when setting the port role. For any other value the function 'br_mrp_set_port_role' will return -EINVAL. Fixes: 20f6a05ef63594 ("bridge: mrp: Rework the MRP netlink interface") Signed-off-by: Horatiu Vultur --- net/bridge/br_mrp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c index 24986ec7d38cc..779e1eb754430 100644 --- a/net/bridge/br_mrp.c +++ b/net/bridge/br_mrp.c @@ -411,10 +411,16 @@ int br_mrp_set_port_role(struct net_bridge_port *p, if (!mrp) return -EINVAL; - if (role == BR_MRP_PORT_ROLE_PRIMARY) + switch (role) { + case BR_MRP_PORT_ROLE_PRIMARY: rcu_assign_pointer(mrp->p_port, p); - else + break; + case BR_MRP_PORT_ROLE_SECONDARY: rcu_assign_pointer(mrp->s_port, p); + break; + default: + return -EINVAL; + } br_mrp_port_switchdev_set_role(p, role); -- 2.26.2