From patchwork Wed Jul 12 11:26:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Viswanathan X-Patchwork-Id: 119118 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1098804vqm; Wed, 12 Jul 2023 05:06:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlF3oRTiRX7+Fek2NJ1s+FJ7YLXtXPrEUNd033mE0RcOcjC8Dp7GhJ3a7UdDoZbNgGc1QBdX X-Received: by 2002:a05:6402:2686:b0:51e:5aac:6bad with SMTP id w6-20020a056402268600b0051e5aac6badmr2369094edd.11.1689163573780; Wed, 12 Jul 2023 05:06:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689163573; cv=none; d=google.com; s=arc-20160816; b=smtoPljZeVb3ZPXCXmeNA6fRS7/ikOp/5StH2KzGrZHe+GkmcM5oHsIUsSE355Q0LH uiiAKSsWXSC6d3Xlfv26DYABgHSkx4JMDYt/gM50e9Jil/cfFNguB44pSXYgb1yntk1C TBcU3kERmGTeAnz9Derm7o2ihnbgYeEWtmxE3Vgr+gMqRc2eBMNvBwK7CDAzCrMHo2l3 KfSFhta6cG5U23I8yJBCELSfYJR1+NHEUelTWfZ0fstJ5I38jzM71vBMhhBLSp24DlJ0 GT1dxQ4T5y0JjUV6q9YZ4dQ/EhWY6RyfNjRf+OwlSsxV9sMWfjFAMpnl9/DpOEtTWyzQ 9TJQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cmLwhl220UufF6mjISkXG0k6vuwgQbfw2yx/QD8D/8Y=; fh=xHrKp8+bUxvfI02f9POZGuAxmAt/WwBN7skM37uOXYU=; b=A27ENksm2TOWzdL7py66AxkjFEQFjCLeuukJLXgNEc360ZensG4506lC/5ZTPexT7C yp0WOggs0rCMQ33SvnDyP61U7QF+hFUCFF1RDU1PDQpj0kqqyeph47RGlVB99txHXBIi E8gvSa2xh/3Ts2r4wNMaT5rHb71EPwvFMsyScbWIqILvg44MD95jH02RmLGlWrLGXLaR bphJX5L8lxbajpyZRBJQUlCkTgK4CKooYk+R/vFQAI3aZanI68bvk2waiFmwz1LYZFvY Ww9YhavvowLiUHfaIje1+BB2M/LQsWeNPMlaNPVxMZk3uXTtXxQWXdFIakaRI5gTs4lz ca0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b="O/FXsB2J"; 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=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n23-20020a056402061700b0051df43b5333si4486259edv.330.2023.07.12.05.05.49; Wed, 12 Jul 2023 05:06:13 -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=@quicinc.com header.s=qcppdkim1 header.b="O/FXsB2J"; 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=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233161AbjGLL1g (ORCPT + 99 others); Wed, 12 Jul 2023 07:27:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232837AbjGLL1e (ORCPT ); Wed, 12 Jul 2023 07:27:34 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AECCD173C; Wed, 12 Jul 2023 04:27:33 -0700 (PDT) Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36C8dJKC002271; Wed, 12 Jul 2023 11:27:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=cmLwhl220UufF6mjISkXG0k6vuwgQbfw2yx/QD8D/8Y=; b=O/FXsB2JgQmLCG2UzIOK9VqsKt7DaSZTjw9rPnyEtz9a+rYpvHMiQrcXtVcgLEoAoma0 MkFR5xaAq+4Zo2tcBcovQl+QsLNkMn2Lm/rz1noxIyld2AYwqicu9tCjcd2FWFT/h+Hf KByLZpJNvEjznRO1XbFrXSAp/86sXgVpLm4EqsBwGL/JYVbmhFH49x5etJy4VEGcMXhK JdfzKLd1Saoax+E8JZJLfCu9xrZDHoaXvwruUP2Fn1vUVe2kzPrlxg+ffE+NwlXi8O0k zmyAHXpZORGRmV0qTmoE9BKmsK+INCPIcOUmLg/pVm0w8hp0mukRd/xNo87bjGePWOyD 1Q== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3rsetdsb6t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jul 2023 11:27:27 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 36CBRQNp005639 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jul 2023 11:27:26 GMT Received: from hu-viswanat-blr.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Wed, 12 Jul 2023 04:27:08 -0700 From: Vignesh Viswanathan To: , , , , , , , CC: , , Vignesh Viswanathan Subject: [PATCH net-next 3/3] net: qrtr: Handle IPCR control port format of older targets Date: Wed, 12 Jul 2023 16:56:31 +0530 Message-ID: <20230712112631.3461793-4-quic_viswanat@quicinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230712112631.3461793-1-quic_viswanat@quicinc.com> References: <20230712112631.3461793-1-quic_viswanat@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: HVaK991--dRbY0Zrp94qzLBwEF0GgsyZ X-Proofpoint-GUID: HVaK991--dRbY0Zrp94qzLBwEF0GgsyZ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-12_06,2023-07-11_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 suspectscore=0 lowpriorityscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 mlxlogscore=999 spamscore=0 mlxscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2307120102 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771216383835672664 X-GMAIL-MSGID: 1771216383835672664 The destination port value in the IPCR control buffer on older targets is 0xFFFF. Handle the same by updating the dst_port to QRTR_PORT_CTRL. Signed-off-by: Vignesh Viswanathan Reviewed-by: Simon Horman --- net/qrtr/af_qrtr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index 78beb74146e7..41ece61eb57a 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -23,6 +23,8 @@ #define QRTR_EPH_PORT_RANGE \ XA_LIMIT(QRTR_MIN_EPH_SOCKET, QRTR_MAX_EPH_SOCKET) +#define QRTR_PORT_CTRL_LEGACY 0xffff + /** * struct qrtr_hdr_v1 - (I|R)PCrouter packet header version 1 * @version: protocol version @@ -495,6 +497,9 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) goto err; } + if (cb->dst_port == QRTR_PORT_CTRL_LEGACY) + cb->dst_port = QRTR_PORT_CTRL; + if (!size || len != ALIGN(size, 4) + hdrlen) goto err;