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 7F7D11DEFE7; Thu, 20 Feb 2025 15:47:59 +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=1740066481; cv=none; b=VOoH2HmgdmDSK26dT0bqeR+mKPXOW2to+NaTl3t9Uus/kO5NFoJis6mvTYuMB5LTzEWxoqFSD/bUnjPHh5AWkmybCksjaudI18GD3WgOOkdS+oLYcBV1f2Jlkm/rcvS7lYhidrUi9PIgpm6cFuIRfW9xyVlb/nMuYHPu+6JCY3w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740066481; c=relaxed/simple; bh=WDcJxs73TYGkblWc3guiG9mUgONjDcDHI0IQwjKzDn8=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=XsiVI8mJYSaOB7DM1G5I3J32oIqmAh+GKKie29zTqmu/cTPQvijdAkXUfVAZEc2oA06dt/qYa2orF2qeZi3IS2lFythmvWM3xcuSrlp8QTow6/O3gCNcqTm7YlYgCIVnNjwQdJL46mBJimvmsQtIiON6JJXEUC2DD+2ie2UNjHo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=ivmiuART; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="ivmiuART" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51K8uHx7017365; Thu, 20 Feb 2025 15:47:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= CzMC/7qU8FxW4r8Axq2lYrkP/LJI3DYiVz+bdFPtSsA=; b=ivmiuARTbwKfkbiy UWpzJLOBRPQic0j0QKiVDMa4JLWvPa0lwumylykn4+N16vTN0YKDYZg51+uyJn4x iyLVapWZTCaQm4DtHxAKW1cXPmFW3Y0JNFSv8kBLp0TobBcXzIJF+VTl0vXxuU6f ttW6Yck8tqi52rwTfs+fpvOU6RDu2PpvX6OuXI3zyWmauMsxJ3gab4Rsrc44hYNr 0bnP/gh9OncRIY72B0/yKh8kre1Npf5K3kEIaP1fByIXd3lGViRwV2w0KPQZvZJG YevAO/xldawh7VQdM6a5FgSJRgt3cG5+mpzKS345RghCZo54S9ODejFJX3hjsQaS 4FS6Qw== Received: from nasanppmta02.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44vyy3en7h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Feb 2025 15:47:49 +0000 (GMT) Received: from nasanex01a.na.qualcomm.com (nasanex01a.na.qualcomm.com [10.52.223.231]) by NASANPPMTA02.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 51KFlm6X018085 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Feb 2025 15:47:48 GMT Received: from [10.216.21.168] (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Thu, 20 Feb 2025 07:47:43 -0800 Message-ID: <269bcc4d-fcd7-04b2-af3c-2b4716285adc@quicinc.com> Date: Thu, 20 Feb 2025 21:17:40 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH v4 2/4] media: venus: hfi_parser: refactor hfi packet parsing logic Content-Language: en-US To: Hans Verkuil , Stanimir Varbanov , Bryan O'Donoghue , Mauro Carvalho Chehab , Tomasz Figa , Hans Verkuil CC: Stanimir Varbanov , Mauro Carvalho Chehab , Dmitry Baryshkov , , , , References: <20250207-venus_oob_2-v4-0-522da0b68b22@quicinc.com> <20250207-venus_oob_2-v4-2-522da0b68b22@quicinc.com> <18a005e1-e235-4c2b-8d1a-b593868843a5@xs4all.nl> <37934625-661f-4347-a1cf-b77d0a8702ca@xs4all.nl> From: Vikash Garodia In-Reply-To: <37934625-661f-4347-a1cf-b77d0a8702ca@xs4all.nl> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: q-uEbCr78x9aM7wDBhsQ7iSIIGmmbhsi X-Proofpoint-GUID: q-uEbCr78x9aM7wDBhsQ7iSIIGmmbhsi X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-20_06,2025-02-20_02,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 clxscore=1015 phishscore=0 adultscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 spamscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2502200112 On 2/20/2025 9:12 PM, Hans Verkuil wrote: > On 2/20/25 16:38, Vikash Garodia wrote: >> >> On 2/20/2025 8:50 PM, Hans Verkuil wrote: >>> On 2/7/25 09:24, Vikash Garodia wrote: >>>> words_count denotes the number of words in total payload, while data >>>> points to payload of various property within it. When words_count >>>> reaches last word, data can access memory beyond the total payload. This >>>> can lead to OOB access. With this patch, the utility api for handling >>>> individual properties now returns the size of data consumed. Accordingly >>>> remaining bytes are calculated before parsing the payload, thereby >>>> eliminates the OOB access possibilities. >>>> >>>> Cc: stable@vger.kernel.org >>>> Fixes: 1a73374a04e5 ("media: venus: hfi_parser: add common capability parser") >>>> Signed-off-by: Vikash Garodia >>>> --- >>>> drivers/media/platform/qcom/venus/hfi_parser.c | 95 +++++++++++++++++++------- >>>> 1 file changed, 69 insertions(+), 26 deletions(-) >>>> >>>> diff --git a/drivers/media/platform/qcom/venus/hfi_parser.c b/drivers/media/platform/qcom/venus/hfi_parser.c >>>> index 1cc17f3dc8948160ea6c3015d2c03e475b8aa29e..404c527329c5fa89ee885a6ad15620c9c90a99e4 100644 >>>> --- a/drivers/media/platform/qcom/venus/hfi_parser.c >>>> +++ b/drivers/media/platform/qcom/venus/hfi_parser.c >>>> @@ -63,7 +63,7 @@ fill_buf_mode(struct hfi_plat_caps *cap, const void *data, unsigned int num) >>>> cap->cap_bufs_mode_dynamic = true; >>>> } >>>> >>>> -static void >>>> +static int >>>> parse_alloc_mode(struct venus_core *core, u32 codecs, u32 domain, void *data) >>>> { >>>> struct hfi_buffer_alloc_mode_supported *mode = data; >>>> @@ -71,7 +71,7 @@ parse_alloc_mode(struct venus_core *core, u32 codecs, u32 domain, void *data) >>>> u32 *type; >>>> >>>> if (num_entries > MAX_ALLOC_MODE_ENTRIES) >>>> - return; >>>> + return -EINVAL; >>>> >>>> type = mode->data; >>>> >>>> @@ -83,6 +83,8 @@ parse_alloc_mode(struct venus_core *core, u32 codecs, u32 domain, void *data) >>>> >>>> type++; >>>> } >>>> + >>>> + return sizeof(*mode); >>>> } >>>> >>>> static void fill_profile_level(struct hfi_plat_caps *cap, const void *data, >>>> @@ -97,7 +99,7 @@ static void fill_profile_level(struct hfi_plat_caps *cap, const void *data, >>>> cap->num_pl += num; >>>> } >>>> >>>> -static void >>>> +static int >>>> parse_profile_level(struct venus_core *core, u32 codecs, u32 domain, void *data) >>>> { >>>> struct hfi_profile_level_supported *pl = data; >>>> @@ -105,12 +107,14 @@ parse_profile_level(struct venus_core *core, u32 codecs, u32 domain, void *data) >>>> struct hfi_profile_level pl_arr[HFI_MAX_PROFILE_COUNT] = {}; >>>> >>>> if (pl->profile_count > HFI_MAX_PROFILE_COUNT) >>>> - return; >>>> + return -EINVAL; >>>> >>>> memcpy(pl_arr, proflevel, pl->profile_count * sizeof(*proflevel)); >>>> >>>> for_each_codec(core->caps, ARRAY_SIZE(core->caps), codecs, domain, >>>> fill_profile_level, pl_arr, pl->profile_count); >>>> + >>>> + return pl->profile_count * sizeof(*proflevel) + sizeof(u32); >>>> } >>>> >>>> static void >>>> @@ -125,7 +129,7 @@ fill_caps(struct hfi_plat_caps *cap, const void *data, unsigned int num) >>>> cap->num_caps += num; >>>> } >>>> >>>> -static void >>>> +static int >>>> parse_caps(struct venus_core *core, u32 codecs, u32 domain, void *data) >>>> { >>>> struct hfi_capabilities *caps = data; >>>> @@ -134,12 +138,14 @@ parse_caps(struct venus_core *core, u32 codecs, u32 domain, void *data) >>>> struct hfi_capability caps_arr[MAX_CAP_ENTRIES] = {}; >>>> >>>> if (num_caps > MAX_CAP_ENTRIES) >>>> - return; >>>> + return -EINVAL; >>>> >>>> memcpy(caps_arr, cap, num_caps * sizeof(*cap)); >>>> >>>> for_each_codec(core->caps, ARRAY_SIZE(core->caps), codecs, domain, >>>> fill_caps, caps_arr, num_caps); >>>> + >>>> + return sizeof(*caps); >>>> } >>>> >>>> static void fill_raw_fmts(struct hfi_plat_caps *cap, const void *fmts, >>>> @@ -154,7 +160,7 @@ static void fill_raw_fmts(struct hfi_plat_caps *cap, const void *fmts, >>>> cap->num_fmts += num_fmts; >>>> } >>>> >>>> -static void >>>> +static int >>>> parse_raw_formats(struct venus_core *core, u32 codecs, u32 domain, void *data) >>>> { >>>> struct hfi_uncompressed_format_supported *fmt = data; >>>> @@ -163,7 +169,8 @@ parse_raw_formats(struct venus_core *core, u32 codecs, u32 domain, void *data) >>>> struct raw_formats rawfmts[MAX_FMT_ENTRIES] = {}; >>>> u32 entries = fmt->format_entries; >>>> unsigned int i = 0; >>>> - u32 num_planes; >>>> + u32 num_planes = 0; >>>> + u32 size; >>>> >>>> while (entries) { >>>> num_planes = pinfo->num_planes; >>>> @@ -173,7 +180,7 @@ parse_raw_formats(struct venus_core *core, u32 codecs, u32 domain, void *data) >>>> i++; >>>> >>>> if (i >= MAX_FMT_ENTRIES) >>>> - return; >>>> + return -EINVAL; >>>> >>>> if (pinfo->num_planes > MAX_PLANES) >>>> break; >>>> @@ -185,9 +192,13 @@ parse_raw_formats(struct venus_core *core, u32 codecs, u32 domain, void *data) >>>> >>>> for_each_codec(core->caps, ARRAY_SIZE(core->caps), codecs, domain, >>>> fill_raw_fmts, rawfmts, i); >>>> + size = fmt->format_entries * (sizeof(*constr) * num_planes + 2 * sizeof(u32)) >>>> + + 2 * sizeof(u32); >>>> + >>>> + return size; >>>> } >>>> >>>> -static void parse_codecs(struct venus_core *core, void *data) >>>> +static int parse_codecs(struct venus_core *core, void *data) >>>> { >>>> struct hfi_codec_supported *codecs = data; >>>> >>>> @@ -199,21 +210,27 @@ static void parse_codecs(struct venus_core *core, void *data) >>>> core->dec_codecs &= ~HFI_VIDEO_CODEC_SPARK; >>>> core->enc_codecs &= ~HFI_VIDEO_CODEC_HEVC; >>>> } >>>> + >>>> + return sizeof(*codecs); >>>> } >>>> >>>> -static void parse_max_sessions(struct venus_core *core, const void *data) >>>> +static int parse_max_sessions(struct venus_core *core, const void *data) >>>> { >>>> const struct hfi_max_sessions_supported *sessions = data; >>>> >>>> core->max_sessions_supported = sessions->max_sessions; >>>> + >>>> + return sizeof(*sessions); >>>> } >>>> >>>> -static void parse_codecs_mask(u32 *codecs, u32 *domain, void *data) >>>> +static int parse_codecs_mask(u32 *codecs, u32 *domain, void *data) >>>> { >>>> struct hfi_codec_mask_supported *mask = data; >>>> >>>> *codecs = mask->codecs; >>>> *domain = mask->video_domains; >>>> + >>>> + return sizeof(*mask); >>>> } >>>> >>>> static void parser_init(struct venus_inst *inst, u32 *codecs, u32 *domain) >>>> @@ -282,8 +299,9 @@ static int hfi_platform_parser(struct venus_core *core, struct venus_inst *inst) >>>> u32 hfi_parser(struct venus_core *core, struct venus_inst *inst, void *buf, >>>> u32 size) >>>> { >>>> - unsigned int words_count = size >> 2; >>>> - u32 *word = buf, *data, codecs = 0, domain = 0; >>>> + u32 *words = buf, *payload, codecs = 0, domain = 0; >>>> + u32 *frame_size = buf + size; >>>> + u32 rem_bytes = size; >>>> int ret; >>>> >>>> ret = hfi_platform_parser(core, inst); >>>> @@ -300,38 +318,63 @@ u32 hfi_parser(struct venus_core *core, struct venus_inst *inst, void *buf, >>>> memset(core->caps, 0, sizeof(core->caps)); >>>> } >>>> >>>> - while (words_count) { >>>> - data = word + 1; >>>> + while (words < frame_size) { >>>> + payload = words + 1; >>>> >>>> - switch (*word) { >>>> + switch (*words) { >>>> case HFI_PROPERTY_PARAM_CODEC_SUPPORTED: >>>> - parse_codecs(core, data); >>>> + if (rem_bytes <= sizeof(struct hfi_codec_supported)) >>>> + return HFI_ERR_SYS_INSUFFICIENT_RESOURCES; >>>> + >>>> + ret = parse_codecs(core, payload); >>>> init_codecs(core); >>> >>> Does it make sense to call init_codecs if parse_codecs returned an error? >>> It certainly looks weird, so even if it is OK, perhaps a comment might be >>> useful. >> parse_codecs() returns the sizeof(struct hfi_codec_supported), so it would >> always be a valid value. I can put up a comment though. > > Ah, so parse_codecs can never return an error. But what if someone in the future > does exactly that? I think it is still better to check for an error here. It just > feels like a bug waiting to happen in the future. Ok, i can add a check to safeguard it. > > Regards, > > Hans > >>> >>>> break; >>>> case HFI_PROPERTY_PARAM_MAX_SESSIONS_SUPPORTED: >>>> - parse_max_sessions(core, data); >>>> + if (rem_bytes <= sizeof(struct hfi_max_sessions_supported)) >>>> + return HFI_ERR_SYS_INSUFFICIENT_RESOURCES; >>>> + >>>> + ret = parse_max_sessions(core, payload); >>>> break; >>>> case HFI_PROPERTY_PARAM_CODEC_MASK_SUPPORTED: >>>> - parse_codecs_mask(&codecs, &domain, data); >>>> + if (rem_bytes <= sizeof(struct hfi_codec_mask_supported)) >>>> + return HFI_ERR_SYS_INSUFFICIENT_RESOURCES; >>>> + >>>> + ret = parse_codecs_mask(&codecs, &domain, payload); >>>> break; >>>> case HFI_PROPERTY_PARAM_UNCOMPRESSED_FORMAT_SUPPORTED: >>>> - parse_raw_formats(core, codecs, domain, data); >>>> + if (rem_bytes <= sizeof(struct hfi_uncompressed_format_supported)) >>>> + return HFI_ERR_SYS_INSUFFICIENT_RESOURCES; >>>> + >>>> + ret = parse_raw_formats(core, codecs, domain, payload); >>>> break; >>>> case HFI_PROPERTY_PARAM_CAPABILITY_SUPPORTED: >>>> - parse_caps(core, codecs, domain, data); >>>> + if (rem_bytes <= sizeof(struct hfi_capabilities)) >>>> + return HFI_ERR_SYS_INSUFFICIENT_RESOURCES; >>>> + >>>> + ret = parse_caps(core, codecs, domain, payload); >>>> break; >>>> case HFI_PROPERTY_PARAM_PROFILE_LEVEL_SUPPORTED: >>>> - parse_profile_level(core, codecs, domain, data); >>>> + if (rem_bytes <= sizeof(struct hfi_profile_level_supported)) >>>> + return HFI_ERR_SYS_INSUFFICIENT_RESOURCES; >>>> + >>>> + ret = parse_profile_level(core, codecs, domain, payload); >>>> break; >>>> case HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE_SUPPORTED: >>>> - parse_alloc_mode(core, codecs, domain, data); >>>> + if (rem_bytes <= sizeof(struct hfi_buffer_alloc_mode_supported)) >>>> + return HFI_ERR_SYS_INSUFFICIENT_RESOURCES; >>>> + >>>> + ret = parse_alloc_mode(core, codecs, domain, payload); >>>> break; >>>> default: >>>> + ret = sizeof(u32); >>>> break; >>>> } >>>> >>>> - word++; >>>> - words_count--; >>>> + if (ret < 0) >>>> + return HFI_ERR_SYS_INSUFFICIENT_RESOURCES; >>>> + >>>> + words += ret / sizeof(u32); >>> >>> Would it make sense to check and warn if ret is not a multiple of sizeof(u32)? >>> Up to you, just an idea. >> almost all the individual parsing api in the various cases returns size of >> predefined structures (or in their multiples), which would make them return in >> multiple of sizeof(u32). Let say, if it encounters a non multiple of >> sizeof(u32), the while loop would iterate couple of more iterations to hit the >> next case in the payload. >>> >>>> + rem_bytes -= ret; >>>> } >>>> >>>> if (!core->max_sessions_supported) >>>> >>> >>> Regards, >>> >>> Hans >> Regards, >> Vikash >