From patchwork Tue Dec 17 09:31:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sicelo X-Patchwork-Id: 13911475 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D7B8188014 for ; Tue, 17 Dec 2024 09:32:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734427943; cv=none; b=eJw7yXbjQkmcWZU4cqP3xfR4eqcanbCGo6rnqLBogwdRXh8BNtA4SYt9lIYfwxRx/hyphYQDB/yFuubX+5AfT6SdgfwhM+E3kcP/NyNRE21KH5Yja0St1aXZHTzPFySQrI4SysESQ0GSJ9rV+8M7ehJW5OFbsmzwDszf2WWQKPE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734427943; c=relaxed/simple; bh=ILZAYwUk/DSCT7EuUJZ2MMDiq7SKf25AU6N/814bC+E=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=nOadK+r6Qt7iEYjWgHqzyG8/VADOD2YyzpzVSk57DmuqZF8xJKImmukxf4DYx9FOyQbogfcJzv5gbBosiT1yEgQRdEuhBLQpeeKFfhnmva2MeCE9YnxwlJtyJmJUCp0IqKfglXZdlmNCeDUsfyW7dpIPyNr5sALo7UreFR+VCBE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JBDsLYrq; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JBDsLYrq" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-aa6aee68a57so743453966b.3 for ; Tue, 17 Dec 2024 01:32:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734427940; x=1735032740; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KJsc4o1c6jnSv9LOCDTRbPOWWQRnItGG2p5/yupt4Hw=; b=JBDsLYrqB0c7EYw/m9y9e+bDYTHKFXlUpPCT9n7zPIq5FcacfehobSCD4LkATikIh2 nHLxWPmMpV4uyNylJlX2dj9kEhG0lAPSU0SR+1rt+rZZsfAVUtFt0Q81CPwSik5Btg8W 4DAca6tMNY7/8zVdQYoMmYyFHhcR/EszMFFhRIlqWPDCRj8DDQF7ng65oJvmuwePWHzX x2lQFZBccd5JG0GsQ4YVX/wUhSd5btyEvVhVrLM3UuDFYjes/K6X9gQL4zfSJ4rCebJv Rh6L/Es4gHlJ04vG678aSynsH4mdTug618x13x0jhhAT/WZ6wdA6cXz5R41nqN6Tsjzg ErvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734427940; x=1735032740; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KJsc4o1c6jnSv9LOCDTRbPOWWQRnItGG2p5/yupt4Hw=; b=Baqg3SC1elCT0bcuzq9EEX31Pf0Qa4aYx1Ppw5w/661TbmZR6N3y99QsO9DgDVCwC8 /Hq+RaHF9pTK84lbbx1cZBTNwX2x+0DhwZhjHez02fC6KIUYoGj0kkwgmhs7YtSErszl S3BuW5RWwcs7Zvt1h8X3UTPp4ZU+9LMNwOGd4QYeY+CNpcC3JLyUEbvq581BHb+MMCth b5xxQwWUAoq0yv7cJowGwosKbg+YOJDtTmC/usxaYlHk/eAm3+Hkk+FG5fnOWg/FFGjC fKUVw+wGPm/U5d5E0B5KryoNONZFK2WxtIGiMVhbtee/jYmBfmO8UOuzL9cJ72fez4pR 90Qg== X-Gm-Message-State: AOJu0YzkGPAXEsTjXw2ctHHfzXFaNr/2I+iFdoNiEiJ3DZL/U2cFbu8I EBkXk1bt9aRn/OkqP3SAi2gnFbVC0FdN9dQtdYI82l9dy0pxI9OqR7goRX+v X-Gm-Gg: ASbGncsrKiO5nEhcADRRyV+dN1uNu5xJx0t68Btpm0hvMh5+yEbbPAtEUKqraQuOeC/ CsloaGhvC24BFPfP9Ch01ByrYywGl/vhcLU6mcw9qffblxv+8QWVQwTUX+XgD4ISf/C1Shff6Pg yYnq3mT3m/KElBVzNXYRJ37EMQJnLMwwaF9Rc52ZakX5+nbVzypg/ub1cQuQo422CuCXW08vAt1 h4PzJevwXES5NUhLBMqAkU4ZtMEjDdgf8xHiXT+RReXOuHrvpOrgS0E X-Google-Smtp-Source: AGHT+IFk5Nw4iBx4Dpijv3Hlv7jq/2dZ1wIkUFSVzvE+pN3ql9rN1BPTTQx0yxN+zRj1TZnZvp2GlA== X-Received: by 2002:a17:906:2931:b0:aa6:85d0:1486 with SMTP id a640c23a62f3a-aab77ee9688mr1325012666b.54.1734427939240; Tue, 17 Dec 2024 01:32:19 -0800 (PST) Received: from tpt440p.. ([69.63.64.50]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aab963598b7sm425536566b.101.2024.12.17.01.32.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 01:32:18 -0800 (PST) From: "Sicelo A. Mhlongo" To: ofono@lists.linux.dev Cc: "Sicelo A. Mhlongo" Subject: [PATCH v2 1/3] util: ensure decode_hex_own_buf is passed a valid buffer Date: Tue, 17 Dec 2024 11:31:27 +0200 Message-ID: <20241217093207.20636-1-absicsz@gmail.com> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- src/util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util.c b/src/util.c index 53d55d7e..bfe46ef2 100644 --- a/src/util.c +++ b/src/util.c @@ -3181,6 +3181,9 @@ unsigned char *decode_hex_own_buf(const char *in, long len, long *items_written, char c; unsigned char b; + if (!buf) + return NULL; + if (len < 0) len = strlen(in); From patchwork Tue Dec 17 09:31:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sicelo X-Patchwork-Id: 13911476 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D92D1531E1 for ; Tue, 17 Dec 2024 09:32:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734427949; cv=none; b=m+w7YbBd8uJ9E2VpdE1B32tz+uI49zaXO2duzj8U/W9z9P7hQhGVS+jUiJtsHHg3N2kAtly2LIWvMQVK91+VA4I52BIUUl8TVwZdysAZM8wAwZ0Qjba/Sq0QOpDq+muzoCcQUjzizxkRAhYMrAUE1pdp9Ad22CaAD5Pr0XYLUgU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734427949; c=relaxed/simple; bh=sUjNE2HMyoX4vb1YpfYId71c4OT4L/kFHF/x3yQZY8E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jvgsqZ+bOtRoBJQSFznY0XiuUwtaUA2KtkUMW/tsRmpR3fqNYpIY6gBIwh4H39OSNqunrRewmAsISpE6nnzZ7Sl4Fnm/zG6eCNHqTAMBKkfb9bdzXOXm/lpbGNlpmkGEqpL8c4XT7n6bFsVAskE0P64a2WGOY5fOLIfrUYAtXVA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=X3bI4p6C; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="X3bI4p6C" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-aa662795ca3so1172539566b.1 for ; Tue, 17 Dec 2024 01:32:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734427946; x=1735032746; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NevN2wwzyAP5C+vyw3UFiYN66h6ehOD991ZX3ZcigO4=; b=X3bI4p6Cso0v6gspc0AmkAC1uVRUnAnQD1bWJbuFS2QU+lIuVswUxNFCrw050zL8/8 0tMdW1rhAIpp6ExFqgK7GR/F6TcdilrINvAkryRnMWHs59Cnu+IojbaEkvTEy0GmzpGD Vzh0OrrZkgaM3CfHJ9b8MV5A8oeh4jUNB1AaE/s/ovmAVvW7HrSEp7kCPS39gTgiWv6v d2oIC6OmsBTPleqP8m+1914cd+DC8pruFSioxgHDrPRfy+EqcwbhRSTHZhQdQuWEvlOt FvxJ+JnJ/ihUwEQL3GrrXtDsL6rIEDV6+Huzn+CUBxH2v4CK8xqn2+0SpRW2z0GivyxH s1yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734427946; x=1735032746; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NevN2wwzyAP5C+vyw3UFiYN66h6ehOD991ZX3ZcigO4=; b=quc5ATvKKU3eSPe018+sa1DNHq4Bmq+UQ/l95wb2y4SQlJJUiYj8T3DV8Z+3zi+EzZ KuJbcfo4GWBicvL2Vbt2PlfRmejTMD+hTo3xvcJ5wBOv3fuu63S3XNx/O+o79HroMer8 Q9gFBYEYWAzyBnpkZIjsDHbmpv/qSgPYwacbl9iUGozeqWAwtf1ssC8xoDkG8DlDe9DV DEUOC8zXhXX1ncQIY353eVu2Goq/GshWKgQWC+P+B8P8gjUSh+jS7+D8GCc+w0IqrliS hwJzaGyGRVtPa91vQh4oibmHl6YRAPb149SybzG1tx5W+iAKIcySznG3641hShmaJylu m85Q== X-Gm-Message-State: AOJu0YyyZVTIQMiayBPV1ON0hDDRglv8LpofhhUvHCaCM2pO755WFCL6 wAV758r5cZGYuMoIwd7AfP0vuw+XI967nQQ+659MVDdbSxBjxnBbUA7Vt9O7 X-Gm-Gg: ASbGncufGigA7oHzzifaSdKNdX/3YgI92h01/XdxU9GUjS43dAe52a2rFIIM44Y68ub 7C2AoKV04At0e/3ch3DigTg4Dyn+VPqgprz+17g0fNitDwQ0PzcE92ynAHCXkFoNf4yTooipCDP uCFJn5+Xsgl5BXhMdZGEs/yvlrwKKex6k4+BlW+jul+QQR1jypKU3pwnIoSmNpvWB+R3vcZWWu6 hq/iCsXojYKoRyHSMpfLcSS6/qKJ4IejyYMWVO/wn6JJXhpg/YWcTEc X-Google-Smtp-Source: AGHT+IEeYOZJ8Uc85kS0okwWzWCu35hp4cptyce5lcRsIceSzmOACQH47n05x4CrnyLKgFr2LTrOJw== X-Received: by 2002:a17:907:d8b:b0:aa6:1afe:b0a5 with SMTP id a640c23a62f3a-aabdc834bf0mr206825066b.2.1734427946299; Tue, 17 Dec 2024 01:32:26 -0800 (PST) Received: from tpt440p.. ([69.63.64.50]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aab963598b7sm425536566b.101.2024.12.17.01.32.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 01:32:25 -0800 (PST) From: "Sicelo A. Mhlongo" To: ofono@lists.linux.dev Cc: "Sicelo A. Mhlongo" Subject: [PATCH v2 2/3] atmodem: sms: ensure buffer is initialized before use Date: Tue, 17 Dec 2024 11:31:28 +0200 Message-ID: <20241217093207.20636-2-absicsz@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241217093207.20636-1-absicsz@gmail.com> References: <20241217093207.20636-1-absicsz@gmail.com> Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Fixes: CVE-2024-7540 Fixes: CVE-2024-7541 Fixes: CVE-2024-7542 --- drivers/atmodem/sms.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c index d994856b..0668c631 100644 --- a/drivers/atmodem/sms.c +++ b/drivers/atmodem/sms.c @@ -399,7 +399,7 @@ static void at_cmt_notify(GAtResult *result, gpointer user_data) struct sms_data *data = ofono_sms_get_data(sms); GAtResultIter iter; const char *hexpdu; - unsigned char pdu[176]; + unsigned char pdu[176] = {0}; long pdu_len; int tpdu_len; @@ -466,7 +466,7 @@ static void at_cmgr_notify(GAtResult *result, gpointer user_data) struct sms_data *data = ofono_sms_get_data(sms); GAtResultIter iter; const char *hexpdu; - unsigned char pdu[176]; + unsigned char pdu[176] = {0}; long pdu_len; int tpdu_len; @@ -648,7 +648,7 @@ static void at_cmgl_notify(GAtResult *result, gpointer user_data) struct sms_data *data = ofono_sms_get_data(sms); GAtResultIter iter; const char *hexpdu; - unsigned char pdu[176]; + unsigned char pdu[176] = {0}; long pdu_len; int tpdu_len; int index; From patchwork Tue Dec 17 09:31:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sicelo X-Patchwork-Id: 13911477 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B54771D3566 for ; Tue, 17 Dec 2024 09:32:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734427955; cv=none; b=uzimJ8dy2cNv2eg+GIqupuzMOT7UzjaNWgP7OCBZUHbMx05PkMpLyOFfhrytHZkc2my3h2AeaC03eY1mF0mJ9jF5CAJbrhvWf/8H7BZx6fZKj+tvejJyziB5oakwdTGgjTLFuDqONax3P6z/Sc/Xs0pcLSUzYANWk7I3AKMGRNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734427955; c=relaxed/simple; bh=sNKVwUxBtVO443p6ZuI6VwL+m/3+CDvSVAyQaGWEyZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b8gzU3TFQ7U78WAz17Sio/Ydpjyxe0lwnfhF97TqOtMN/VJXbt8yyXxJz1ADvYCF7TEXwAgVOE2iKNgoEav7M+5+5fgIuauSPhKeIJrsMF9cFrBYxnio4Loo6M3rhqVen3l5Zs9GvviYxlFSm1C0LTQxQhKXz2Leyl6ETiCkIuU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TxJgxvHi; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TxJgxvHi" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-aa543c4db92so1018019466b.0 for ; Tue, 17 Dec 2024 01:32:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734427952; x=1735032752; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DVTAlOWE2gy7iO+wRGunLYX4/k4U17fbbGbvELSH9mg=; b=TxJgxvHiO6K4UswB0UoEyQsDgfZ6E5v3hZh590YFi7mGBES6/jCEovQjUKpmbr3+k8 PQKFnoPcrJRj3xmcD5NSJePHS+rhr870bJAW75Zjg536KbvGF6atujrJfUylwYfkJUPH fmqp4t3qY2ZNTuPXRwlFJXDw1xQTr+Geg2428mBukSdVxIfXNDOPnZPXRGnGry0IP8g5 9OxiA0S/uuLy9n2dLBfUmk36mba0WzzL3NVM0aR3g60niayCgXrnGpYlpG+XtszN9RYt XwOhWi0q2/CzMStoap4Fwso8wmT/oKAdxBGOXacO/EHOy6guGclVVE9zJlFsUKw7x/n+ FbQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734427952; x=1735032752; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DVTAlOWE2gy7iO+wRGunLYX4/k4U17fbbGbvELSH9mg=; b=p8fAF9jjw96MY64EAMRofv3nj2PrJpbqET7+O9N3X8S3kJB3/WMK0+d5ArZvwIdmqo 98IkThJ70lTds4zDUZuZhU6clH4/Wt+C1/M/r/ocYnwZjLp5tVLMaVAU6bb2UX0nnJ+J QTNT2QIVSv7NrQ8gQp0uR9cILjc/bYfQzLzzF8gV4Y+3H7b6E100X19lFTCDrQLCy84G /5BHBCI1lCHiBp9x2TMsZvlQTv+avr1ySZmpj/r0VGViFsO2FXUl482BtxbMDpKFNSAu MXz24Rk9UXAOcNdjjisvn75N+egZPpD6DaYWZN9zTb1Gw14pvYKa3/0bkYmQ/6bRj6SK siHQ== X-Gm-Message-State: AOJu0YysDweARG+fT1NRmwBKZss0ikWLrlDDbI++UKXVuy1FzAUGzgs5 qeSef4pYwSbrd11qV924q6x2+Q6BDv5ZKE5hIrBZK+wPtCv/Q/eKdeGuI5LC X-Gm-Gg: ASbGncvHvec6rzgFqANMzIpzwl6R1GYsY/H5aXfNqMwNreknP/5ayal4zL1lHesmCLs HBSQ8QcYS1r91roXOAryUSbGPu6NbsFMZygq6TG9NCgj4ccklUTUT2FTczIUrfeH/fZPxvPD7uo eitcObE5h4ppb5+/xNHD3TbhUkBX9+jLIW6Y1LNk8XU9FmsGoSiVbKSd+FHw4G48TlnxXsHe0Bu JM/szNKbA9hQRng+HwdaxPRdfiuPdXVF8DtrJHhs2romR9F3kIe7biC X-Google-Smtp-Source: AGHT+IEp8t6cA2AiZOuj07JFqi+dD4loRhEJHH56LcVCSQEeqgPg6q8Cy099jodAKf011cTJv/T/sw== X-Received: by 2002:a17:907:7809:b0:aa6:c169:4e21 with SMTP id a640c23a62f3a-aab778c1445mr1289759066b.6.1734427951864; Tue, 17 Dec 2024 01:32:31 -0800 (PST) Received: from tpt440p.. ([69.63.64.50]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aab963598b7sm425536566b.101.2024.12.17.01.32.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 01:32:31 -0800 (PST) From: "Sicelo A. Mhlongo" To: ofono@lists.linux.dev Cc: "Sicelo A. Mhlongo" Subject: [PATCH v2 3/3] ussd: ensure ussd content fits in buffers Date: Tue, 17 Dec 2024 11:31:29 +0200 Message-ID: <20241217093207.20636-3-absicsz@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241217093207.20636-1-absicsz@gmail.com> References: <20241217093207.20636-1-absicsz@gmail.com> Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Fixes: CVE-2024-7539 --- drivers/atmodem/ussd.c | 5 ++++- drivers/huaweimodem/ussd.c | 5 ++++- drivers/speedupmodem/ussd.c | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c index 32a9fe91..59dd2e59 100644 --- a/drivers/atmodem/ussd.c +++ b/drivers/atmodem/ussd.c @@ -93,7 +93,7 @@ static void cusd_parse(GAtResult *result, struct ofono_ussd *ussd) const char *content; int dcs; enum sms_charset charset; - unsigned char msg[160]; + unsigned char msg[160] = {0}; const unsigned char *msg_ptr = NULL; long msg_len; @@ -113,6 +113,9 @@ static void cusd_parse(GAtResult *result, struct ofono_ussd *ussd) if (!g_at_result_iter_next_number(&iter, &dcs)) dcs = 0; + if (strlen(content) > sizeof(msg) * 2) + goto out; + if (!cbs_dcs_decode(dcs, NULL, NULL, &charset, NULL, NULL, NULL)) { ofono_error("Unsupported USSD data coding scheme (%02x)", dcs); status = 4; /* Not supported */ diff --git a/drivers/huaweimodem/ussd.c b/drivers/huaweimodem/ussd.c index 5e1c9078..3d165c87 100644 --- a/drivers/huaweimodem/ussd.c +++ b/drivers/huaweimodem/ussd.c @@ -38,7 +38,7 @@ static void cusd_parse(GAtResult *result, struct ofono_ussd *ussd) int status; int dcs = 0; const char *content; - unsigned char msg[160]; + unsigned char msg[160] = {0}; const unsigned char *msg_ptr = NULL; long msg_len; @@ -55,6 +55,9 @@ static void cusd_parse(GAtResult *result, struct ofono_ussd *ussd) g_at_result_iter_next_number(&iter, &dcs); + if (strlen(content) > sizeof(msg) * 2) + goto out; + msg_ptr = decode_hex_own_buf(content, -1, &msg_len, 0, msg); out: diff --git a/drivers/speedupmodem/ussd.c b/drivers/speedupmodem/ussd.c index aafa4bc9..a5efde0c 100644 --- a/drivers/speedupmodem/ussd.c +++ b/drivers/speedupmodem/ussd.c @@ -37,7 +37,7 @@ static void cusd_parse(GAtResult *result, struct ofono_ussd *ussd) int status; int dcs = 0; const char *content; - unsigned char msg[160]; + unsigned char msg[160] = {0}; const unsigned char *msg_ptr = NULL; long msg_len; @@ -54,6 +54,9 @@ static void cusd_parse(GAtResult *result, struct ofono_ussd *ussd) g_at_result_iter_next_number(&iter, &dcs); + if (strlen(content) > sizeof(msg) * 2) + goto out; + msg_ptr = decode_hex_own_buf(content, -1, &msg_len, 0, msg); out: