From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51EED258EC1 for ; Thu, 21 May 2026 17:19:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779383955; cv=none; b=bDPA3wl2ZKay8/KcdZHKhW4OgjHgPrJuaqUZ91pEc6cfTxpj8oyJrJWAeBGZttdwdVKlKTRDZF7Q3d4Frc6g9EOMF0KmNnIf0Q0qLuQOGWmt7HlAhMNXnG+vCRwNuuljiCVNGxcJCA4I70B4/DSaPFz1XOoSJyK5pO7S3NDLPN8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779383955; c=relaxed/simple; bh=lOsbTXyy6RN3zDEn9HQJqgmDm8wkXpcOOq9sn9xR5Cg=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=OKVZcqEipL6ZlfIlRS7nkpzAWYwxH2X/rC1kuTCZjQrgPaRKBQWMfb7J2BBBSueC8BTXzo8pK8kFttb/75Nd5AjqFQWBJKptbQfufi1zDrAu8drwlDxIgB6vlJiVqOwyojeQ2jauB6BSNMqNwfnCnFl3BbXVvsUMtUNZsFMjRxU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=cjeRRB+N; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=UkJfFuje; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="cjeRRB+N"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="UkJfFuje" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64LGk56v4049709 for ; Thu, 21 May 2026 17:19:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= NChGK1BaG/5O12ttfPi5g+d3i1i9KIbHQzRVIByizgI=; b=cjeRRB+NnFEldVki Ddl0yyw4gBTS51youqMGfmAs3pY+11Gge3pcpBKDidGmZGq/U7ad+aaGqEImmLyF lsHj12PMW+ilyuZ5DtvoO+FLmNZZeuh0zZcdxlIHzybY9P3rx/rm/k2eA30rVbUN OD8SmuQptxGAvYAFsr+xf5lbMt5oi0Igv9+E+N67mCFmcu46AVIwwmLYligWNbIz 1ZvtMm2sLPHLjoNmDrWk68fxKo14pCa7940YUgMVARBik/0Req8thCz5qtp/7AYd P478yAvwvEFq3AVyUx37aa/Da+tNgu5uhecwqlL10+r3/7T64rMhQ0OdTaboNDZY DdBUcQ== Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9sr33fc6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 21 May 2026 17:19:13 +0000 (GMT) Received: by mail-ua1-f69.google.com with SMTP id a1e0cc1a2514c-95ccfd9b58dso9930205241.2 for ; Thu, 21 May 2026 10:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779383953; x=1779988753; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=NChGK1BaG/5O12ttfPi5g+d3i1i9KIbHQzRVIByizgI=; b=UkJfFujeZR1sePIgTLap/iPBA+lWBagXiayNajytO/szEjq58jU8kM8vKqMfdqPzwq tkdKLyuen6CU1XNBIU7w6potM3L3TyVSUae9RuL6qXpNLkYlIhTnbDSrQo+8uHcPTdQP iAHOk5t3qOCH2/bF5v3KnqACqvZ4AIsmFRjfcSYcB8T8HVrlHJkdNvuk4W+P1SnWOwBV KTX93Udkpr7l2u0m5r2iTXL50JdCmKm00IQC2KpCSVTbHSMzxiwPeET/0Pw9fI2Kj+8v ctPYfGssT7VO1k7dQd3vLN7ly7rA2rMtrx3QgzD7ATA2PXvCyKiOG6PwkmTgSn4pV110 1Cdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779383953; x=1779988753; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NChGK1BaG/5O12ttfPi5g+d3i1i9KIbHQzRVIByizgI=; b=l1QciufwiyoiRzbON8+nare8B+UUHop/uEqm/W5NBF9RjtL/PS46l2H6t4gw2Bi8KB uSJS4g6yHI/T032Tlu+h9LlCGeBOpdkP+FbtW2s0folS46umL6MyhK1Pxq+yYovVbAvv N42VcsVar4TD450enELTXZlImN8XaYB5I4RkurXHPU8BWTbaB0mNJUdY7+1Wx+WWRSQ6 XSBX6q849/2lMzkkyUO3aUq7AbXtN9C4Dl5ImRxZlCQTbibvqP9AtptwdrtPRlpUav3k YV6/MMnmDlSnPDZQJoEaRCf4Nv/S4nnx4Qxx6II3u5Xo4qioStC9XZ7N7ZlA1Ii9uByf mm4Q== X-Forwarded-Encrypted: i=1; AFNElJ8PZg3HVk0KpD3wMS+et0HBzta9IJVpmptiaYSkWpo/wy5ThcXKr+eQUfVpaVV1PeAJmmfINCiyssGUy0A=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6pjwqIU5PzELC0p/5Dy4X3G9OBIzt3fJc1MSUyP/aUU6ZBlHc 76ik7Cv7IFfFVpfq5ckLS3z+8CfWodVhbpOIIlUA8EuyEgtKvHsZ6yKG22Z+hHiG0EPMLq7JetU QoKAGnyuLcvnqDcGmdGhhVK6EmMTtY5v/J5m0JZkYAKchSA3IvW5/HNeml4/n2ngx68HvYp2SXX o= X-Gm-Gg: Acq92OGsbfsIRkLpdqgxkorBeetfuHWid5qtbC+4ocb9CQa0+x0K9NjS8jnxZvUA2Pg LphX2/Oy54+NFei1YFpRSaosXhJuP6okuBFrp/yzvi669/2PoB5nrfnf8bPYXZAd27LVT4c1+nP i58atrOGzJhuocI62Ht3IZqF0kKXsPgj5mctZnK6TnNmFUYSliZ/l1J8dSApxoPDGblcuUvBGuk UotP248z049PGR1VrmdV3Fg9aEENgWUzvrdJvgj8DmgaSVu55C/+b6TOul89ROZ2KXEqa0mJW6q SB/4VKwph4s5h4v2sk3n3Jgoigconxe9FCHsGbPA//tzxh3GFz80wj1qLUhqOm6qzszGWLu2stZ vqlcxZJGbZe1xsldulnta6Z/Xke4rHZX6Uu48M6iURu0hDe7G X-Received: by 2002:a05:6102:3e09:b0:636:984a:1e5d with SMTP id ada2fe7eead31-6738ef6cdf8mr2969431137.11.1779383952396; Thu, 21 May 2026 10:19:12 -0700 (PDT) X-Received: by 2002:a05:6102:3e09:b0:636:984a:1e5d with SMTP id ada2fe7eead31-6738ef6cdf8mr2969377137.11.1779383951916; Thu, 21 May 2026 10:19:11 -0700 (PDT) Received: from [192.168.68.112] ([5.133.47.210]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-45eaa7cf58fsm6207119f8f.3.2026.05.21.10.19.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 May 2026 10:19:11 -0700 (PDT) Message-ID: <1b56fe76-981f-4193-bd39-ceadb7b551e2@oss.qualcomm.com> Date: Thu, 21 May 2026 17:19:10 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/3] soc: qcom: apr: Check response packet length by router type To: Konrad Dybcio , Srinivas Kandagatla , andersson@kernel.org Cc: srini@kernel.org, konradybcio@kernel.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20260514155051.2593354-1-srinivas.kandagatla@oss.qualcomm.com> <20260514155051.2593354-3-srinivas.kandagatla@oss.qualcomm.com> <3381259a-1deb-460c-bbde-a97263914e15@oss.qualcomm.com> Content-Language: en-US From: Srinivas Kandagatla In-Reply-To: <3381259a-1deb-460c-bbde-a97263914e15@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Proofpoint-GUID: Okrn4k2pgmFCXkJnXwuKxPWBzrhO7gTZ X-Proofpoint-ORIG-GUID: Okrn4k2pgmFCXkJnXwuKxPWBzrhO7gTZ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIxMDE3NCBTYWx0ZWRfX4igSHYpcvA+U 90VioU8hVL/X6ezOTzf3MdSyuJL2++pnFqdDihkzcioPtFdlbXTSYnNgDTpqBQmbFBwPRh2S83U i+7u/rNHrpCQQT58/zNXRZs/Odo8UD4HAckT/J7L++07upm9uS7ZoCsTGrOCMOA8lsrAampPfwR KD/THGnAG+W6/R1q0P7QCOyIrQrdkRo9YXytsu5JDzzSZjds3s/OzQXMn43uBIVmGwmrWYlL4pK XAl3wu0cqGYGWOWTjtWEvV9KKtcFT2Ku3pARDI5vuqYnW1yAiAeHpbgIdEjyy3yIUHRpgbieadU i5URV/EQboQLEf6WSVUiWSFfzUcJV+T0mzSBhQLEOnJhO9Zo1GYTz4amjhFBttAq3dACDUYR0Hp ylC/EDmCvEW82cWizFRN/P51r6KrHwAQtvRrSy34LagCpzugWNB9EuPHK3vrNJh0yDMCr5T3I0w vx99U+vwyFxeK5dlIvA== X-Authority-Analysis: v=2.4 cv=L+YtheT8 c=1 sm=1 tr=0 ts=6a0f3e91 cx=c_pps a=UbhLPJ621ZpgOD2l3yZY1w==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=QEoGycGYwv9BmkwOSYYA:9 a=QEXdDO2ut3YA:10 a=TOPH6uDL9cOC6tEoww4z:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-21_03,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 adultscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605210174 On 5/21/26 9:45 AM, Konrad Dybcio wrote: > On 5/14/26 5:50 PM, Srinivas Kandagatla wrote: >> apr_callback() currently validates all received packets against >> APR_HDR_SIZE before queueing them for the RX worker. This is not correct >> for GPR packets, which use a different header size. >> >> Validate the received packet length against the header size matching the >> packet router type before copying the packet. >> >> Signed-off-by: Srinivas Kandagatla >> --- >> drivers/soc/qcom/apr.c | 17 ++++++++++++++--- >> 1 file changed, 14 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/soc/qcom/apr.c b/drivers/soc/qcom/apr.c >> index 127204c195ea..68b357462438 100644 >> --- a/drivers/soc/qcom/apr.c >> +++ b/drivers/soc/qcom/apr.c >> @@ -165,9 +165,20 @@ static int apr_callback(struct rpmsg_device *rpdev, void *buf, >> struct apr_rx_buf *abuf; >> unsigned long flags; >> >> - if (len <= APR_HDR_SIZE) { >> - dev_err(apr->dev, "APR: Improper apr pkt received:%p %d\n", >> - buf, len); >> + switch (apr->type) { >> + case PR_TYPE_APR: >> + if (len <= APR_HDR_SIZE) { >> + dev_err(apr->dev, "APR: Improper apr pkt received:%p %d\n", buf, len); >> + return -EINVAL; >> + } >> + break; >> + case PR_TYPE_GPR: >> + if (len <= GPR_HDR_SIZE) { >> + dev_err(apr->dev, "APR: Improper gpr pkt received:%p %d\n", buf, len); > > It first says "APR:" and then "[ag]pr" later, please at least make the > case consistent Ah, seems like an overlook, thanks for spotting it, will fix this in next spin. > >> + return -EINVAL; >> + } >> + break; > > Switch seems a little far-fetched, unless there'll be more packet types never know... we have similar checks in the driver, atleast its consistent with that. --srini > > Konrad