From patchwork Mon Feb 22 12:13:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 385774 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp1220694jap; Mon, 22 Feb 2021 04:18:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxlvmQvKBfx7ytjEA49AYA2l5+p3CGlg4EhfgRZR/FVr6hk+7IqlYycon+UOkbMGtDF2YEW X-Received: by 2002:aa7:c141:: with SMTP id r1mr7744308edp.284.1613996301883; Mon, 22 Feb 2021 04:18:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613996301; cv=none; d=google.com; s=arc-20160816; b=e4Ya2nO5uE65sBJTMD0NPwdCT713o5JTwG28giqAFxWfIqzsLQOWRi2CU330+fuczB MZ2TYmhYXVuFmVYJL0ych0Ue1BMYHdHSV/LF1mB1qKWDh1uSHrvs/Lt1eLfAuTRB2+wi E8Oz5fLJ+OLXXkeQsKTEzkV2hF/t9knB8gwJGUcvik0TihkFHSE8HJwBBPjrGl4KquFr XInRxRA3hVWYSLZH2N9/Ejq4zvY+0ZYHH2vSMypMlIscP5ZvUiUfmSwL3ufEZjsz0YAd GYL50lpYE934fMO8he1rZnjlemLZXdCXHZ3vLqZke6Na/5hooy0avirlYY4s6v2X/lts tMpQ== 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=K2OoKrWaUJB1BIG30o7DaQpNgXeksZpHz/kizYJByrA=; b=QoBqSBwS+3bs1wUCK5QfZT717uWojqdOQk23UT8fyz3RgJWKx2p/W1rLrWF/rVvTHG KohIOC3NB/LP10mqgIPhqr9se7LoD/s2sWXv/sknjcwJcVp2DouGuop2bPSuZannC0d1 lkrrTWiMPC614bvDe3ZQyJqx4lNdWJ/swK+g5Mp3po+eKJBHaLn1i4POn/kmudncX0+F ZEBZ2JZmdFGYVB6LjLC+y6YqwZauYof4H1WT+xVLonuIUkgMJIteP/bgSpUAVXpBwDlZ +494NdnOwk7L/4hMFEkq2v+XfoSUix86qs6X3pCUgvMEnzQ+F9Z6aSQ6+GYb8PiP8QOc TCBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0DmDPsnH; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f7si13490174edd.343.2021.02.22.04.18.21; Mon, 22 Feb 2021 04:18:21 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0DmDPsnH; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S230231AbhBVMSJ (ORCPT + 13 others); Mon, 22 Feb 2021 07:18:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:45328 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230402AbhBVMQB (ORCPT ); Mon, 22 Feb 2021 07:16:01 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id B85EA64F02; Mon, 22 Feb 2021 12:15:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1613996132; bh=4GNoN85a+lCNiGejDp4sLX/0HFPWgg79ZQy6vYq9j8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0DmDPsnHq0KGk6zh117YqxvLYWbK1+FybWYqm++17hjNvgB0MnKR7BXKY62ez+rKW YJVF8v/S5LDpQNgj9IkDysjaLDFnpw2TmDcFEX9gwu78qr9TqibPY2frDXZaJnu6Wh HyJGsaxHqCfjPS52/KNOpdeyAP0y00H9OtA17g7s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Loic Poulain , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.4 02/13] net: qrtr: Fix port ID for control messages Date: Mon, 22 Feb 2021 13:13:19 +0100 Message-Id: <20210222121017.137917943@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210222121013.583922436@linuxfoundation.org> References: <20210222121013.583922436@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Loic Poulain [ Upstream commit ae068f561baa003d260475c3e441ca454b186726 ] The port ID for control messages was uncorrectly set with broadcast node ID value, causing message to be dropped on remote side since not passing packet filtering (cb->dst_port != QRTR_PORT_CTRL). Fixes: d27e77a3de28 ("net: qrtr: Reset the node and port ID of broadcast messages") Signed-off-by: Loic Poulain Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/qrtr/qrtr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index d6d2736ec9273..ef602976bb2c8 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -187,7 +187,7 @@ static int qrtr_node_enqueue(struct qrtr_node *node, struct sk_buff *skb, hdr->src_port_id = cpu_to_le32(from->sq_port); if (to->sq_port == QRTR_PORT_CTRL) { hdr->dst_node_id = cpu_to_le32(node->nid); - hdr->dst_port_id = cpu_to_le32(QRTR_NODE_BCAST); + hdr->dst_port_id = cpu_to_le32(QRTR_PORT_CTRL); } else { hdr->dst_node_id = cpu_to_le32(to->sq_node); hdr->dst_port_id = cpu_to_le32(to->sq_port);