From patchwork Tue Dec 3 19:43:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Dimitrov X-Patchwork-Id: 13892845 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 05C7B7E0E8 for ; Tue, 3 Dec 2024 19:44:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733255052; cv=none; b=IR65+wODm/2Le9yVYh3oISeAvjC5Z69JTWlUjiW+0Ku52xGnWUlSwWwsfk6UUcz6nqm+mRJTW6kwKBFyYEqDg9aDw8cO9EzuILNn0H/+f4V8MxjqdVV3vUDBEKITSfc0o0akSbREGa0of7wkwgU3tWSNA5n/D8J3hNlbDkMaqS8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733255052; c=relaxed/simple; bh=ZnK7vKM6zjrX7qiXlOWDfFZ7JGZBfUzisAc9dNlTxwE=; h=From:To:Cc:Subject:Date:Message-Id; b=lQGytkTDVE9bBQ9Ul78466aShYyrifnmZ5VgVS42zlnJ42knessh4EFsaVNgeE97tTtXM/rzIYzu2FQGCN06Zwngr+0UxElzBqrAYZUVJqN/hwS6Ufl/qaWqg3kNuj7/8q1DQm8sv/SwvJaI4BYPgKmhhlL3peiho0nVycdYwZQ= 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=jeTi3kKR; arc=none smtp.client-ip=209.85.128.50 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="jeTi3kKR" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-434a742481aso48923285e9.3 for ; Tue, 03 Dec 2024 11:44:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733255049; x=1733859849; darn=lists.linux.dev; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rNB247370OIrls+RAYczpbDPvqzyokPSj12SRkMxsUg=; b=jeTi3kKRtYd0dX5f/Z+FsPCIYgEyfMpU8dOvzeF8rEdmIuJFhs08ZnuWQ+D0ZweLjy sPI8eysH8ZFNs8+Bxy4qUWpxV9LjoGLH4kXh+3rdDoJvoJDA6zezymWZErnyb6Y9aQnn LhLdXkYi8S3Zc8hADhi2jO8tGnbMyoE0/LKOBoCP+LOJ8nW6PcBDX30gw/XlWy8HJBFF UCOSQKppQIsIJ927B92x7nnVVvnMTz/HTWHH9ZDH7qSGpYjSuPQ9LiiUb8hXprAXJPoL xkIfW2nz3gItPOKZScoKcgxDDRsFfy8bxgp3um9RGLYcBkm9Jseh1pRQUdUauScv04oF 8B9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733255049; x=1733859849; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rNB247370OIrls+RAYczpbDPvqzyokPSj12SRkMxsUg=; b=HLln0mFwAEEscfmm1aKwXcoTJITTM8NSQspThZG26thDkJoFHd2wDvVH29CogUVqSM OtwUrr+vQsYmJR7Z+sbNMK98IfY5UA5iE3gEzvJx38DZzOs2KIktbk2BN1oEemJRueYj zc5+Pw1dzGjLYTqQwekCETO2Ghe/F6jPQNyEnUwt2ARu/J/BXK+8tML32q1doSwAF9eg slL/RtFKLZ4kFYen7D86m2TeGN8iaz4BFieQiSY23H9RWdjVgHU9x+S9nHzbluP6k/Oi 4OO6AnXqwMSTutkxwrz1TXkqqqj/vWy0TadBVcHt4YcWGKfHbkWT9CXu3EqfHTmN95rW +o6w== X-Gm-Message-State: AOJu0YwvsZvB/SBF7Fce7sbJ/6yd3w9pnL5fc89dfRpU3aooojqD2LEF l2L6bzLMYsVMcS1QCK+Bw6iS/SY46aPWVh8//bn8teA0ksB3ZEDVC6w+Vg== X-Gm-Gg: ASbGncssaVgJpaTmQPklDt5SA3gH6ySyyLEGz9e/EYs/NZkGJclnHBuQHHWpHnuyKpQ HUbW5CmVY80i/6ZiyyENDo3dtXlm8QUnk2MqcESxTQb3IJfUdjbDpVQpZdcS9X6rgvQbwdLDPK2 IUPIPE4LrWvuj/QYDh4pey1VlE+N++Bg90AidNQ1O2QcAAZjDxl8V76JapEqv1wfFRimG7YsBqR EyUqhOqhrFFrH1eLLG3MXCAwi7WaZ5K64KxaXOVpWk0OmDG65OaDgzFz+vxo5YAThWgIEpq X-Google-Smtp-Source: AGHT+IH8T/l3tXvZ/6zNzqJZTO0twMFRZ3h1j1OdMBcuQd2kGbpYUCuuHD9RTwNYoPgCWWIDg0GVqg== X-Received: by 2002:a05:600c:a4b:b0:433:c76d:d57e with SMTP id 5b1f17b1804b1-434d09a8c9bmr35053685e9.5.1733255048901; Tue, 03 Dec 2024 11:44:08 -0800 (PST) Received: from localhost.localdomain ([95.43.220.235]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434b0d9bec1sm204553455e9.5.2024.12.03.11.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 11:44:08 -0800 (PST) From: Ivaylo Dimitrov To: ofono@lists.linux.dev Cc: denkenz@gmail.com, absicsz@gmail.com, merlijn@wizzup.org, Ivaylo Dimitrov Subject: [PATCH 1/4] stkutil: Fix CVE-2024-7544 Date: Tue, 3 Dec 2024 21:43:49 +0200 Message-Id: <20241203194352.25514-1-ivo.g.dimitrov.75@gmail.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: --- src/stkutil.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/stkutil.c b/src/stkutil.c index 60cad102..066731c9 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -1880,6 +1880,10 @@ static bool parse_dataobj_mms_id(struct comprehension_tlv_iter *iter, data = comprehension_tlv_iter_get_data(iter); mi->len = len; + + if (len > sizeof(mi->id)) + return false; + memcpy(mi->id, data, len); return true; From patchwork Tue Dec 3 19:43:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Dimitrov X-Patchwork-Id: 13892846 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.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 3CDF17E0E8 for ; Tue, 3 Dec 2024 19:44:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733255056; cv=none; b=Y+uzbHP8+/ejDqxd0j452PpilODr1t42Y9pA+tAWOTqMV308VBSSNZ+lcvY4V4Ux4Ix0BcLYNNbI7Ne/gHCSA50t8yX/ezIhixBO2OfGLiLG49fHmvV6I+PftumRN1yhjeQQaYNTbxYMLJYKsmOSBnVx78MMXb9YwBpFRZIwYIc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733255056; c=relaxed/simple; bh=XLD/g7suYDzpnYPkyW55CWTuVZhCs6M5pQZXfguchXs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=cTsHaEsNYRPLiFPYpsYwriEf2tFzS3V+0h3B6/Bb6Wp66Jfg298rjUmXtoeDb5hLubq38hIlH/JyXm6bJ1XA2UFCjYm9K0CStBULE5qXmSE0j25Jk4eBMhmHjttdEWu0xqvGcGwOKk7P3nkTZs8AUpRH/vxZOCQIt4daFglxIAw= 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=TQKh38hn; arc=none smtp.client-ip=209.85.128.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="TQKh38hn" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-434a95095efso960575e9.0 for ; Tue, 03 Dec 2024 11:44:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733255052; x=1733859852; darn=lists.linux.dev; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=R7wt+QYlNJJG7LkFNwKEw37fJ2gKHhGefNaET86epVg=; b=TQKh38hnthN+x+vKuZUBgCfhgPQezFwgS5UqX4v0tO/17OXcdE8sL3y7i7bMOxzsIQ D49Wqt7u8keL0VWsrGz84CAM4sOXyp6M2D0LuxzqRFGlIMBXTUhbPOAZ/Z4EaMIZli+z lT9NLlXEcQ5PykJqvNPbaIb0tXaz7J1LvNMqo51Gy7g0P3/iL8tGNWNZiGjplHgmM71F eMfkPQYcit4oVopVtEes7ki7YsoBOeY2prQgLgbWuJPIJ46haclVdR8/T8IpwAjrbpNZ ItrxOyR829SXj3VGDSi8DCnKXww6TR3lU5r9BdtTJTuA7jefatQLUl3glQQmn7rLuUUO uq6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733255052; x=1733859852; h=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=R7wt+QYlNJJG7LkFNwKEw37fJ2gKHhGefNaET86epVg=; b=O3/hsz4O3hZ77Euzyb+NuOyrHVOTWz3rmAeNak4ww/bGXMQe4WxEAJrYmbpQxy9/mb BKVnK9+lXibpul50Lp8nUyFEoOtUARFfTADpelYuPqBhkPkBqAZGBEu8gruRlljNjQYE dRjTVFJz4FjxWHt4b87/o1B5J9c28HjG2TVbuvolBRnuy+SAbh35aWBw/AHPfzzZjBOi igF4KkSGW8I+akbRkJNh6CBjxZ5+1lkJo5oFwWUc5nemr/PJ5a1vqXNq3Y84qonc00L7 FRJkz6UdAaGm6lxhjLJLeuGAPY1y96ZojUsUv+I53c9ZTsWtQhgoNL+2dEfFzqlgVl+u mw6g== X-Gm-Message-State: AOJu0Yx9E9BbOLbB1xLhPnv0iA1tsAj+tvVR2LjQQpPh80B5WyvElPFQ 3VxvEbimiNptDhfn1I+tBni1QIXV6YpVEmqNHY27SrjsG0+sgg2h7ybqWw== X-Gm-Gg: ASbGnct/YYx5ph7DU6R+Js5D1RK+T/g5kLpHeoMA9dUyJEtZjKAY4+j+DRyysoMTZ+6 D3rQMXsNrewlokTCHm+9RK9mUs4ErQFd/6ykYDmwYzR/iST5BSm87kn2p6ahvYA+zVa/8X9egy8 5ReXtFKBq9gtVXjXI34GX0jdg12fhmbHpydxHVDdMFl0Kw/LZlTLyWSvxprstf7plvgq47q4jOr Y9YWItjmPf29x9RhICprkDbqitw3H83H+/pqUjmWyNBJmD8/xxfT0wOsFxyzLj13pr1mxs5 X-Google-Smtp-Source: AGHT+IHjUdjlMP36T785uVfd7XYsl9O29TDx6s1nXn0poD6T/47mg0I0VMaoz1m/R4i961aA3IBGGw== X-Received: by 2002:a05:600c:198e:b0:434:9cf6:a2a5 with SMTP id 5b1f17b1804b1-434afb9ecc7mr207201675e9.8.1733255052482; Tue, 03 Dec 2024 11:44:12 -0800 (PST) Received: from localhost.localdomain ([95.43.220.235]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434b0d9bec1sm204553455e9.5.2024.12.03.11.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 11:44:12 -0800 (PST) From: Ivaylo Dimitrov To: ofono@lists.linux.dev Cc: denkenz@gmail.com, absicsz@gmail.com, merlijn@wizzup.org, Ivaylo Dimitrov Subject: [PATCH 2/4] stkutil: Fix CVE-2024-7543 Date: Tue, 3 Dec 2024 21:43:50 +0200 Message-Id: <20241203194352.25514-2-ivo.g.dimitrov.75@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20241203194352.25514-1-ivo.g.dimitrov.75@gmail.com> References: <20241203194352.25514-1-ivo.g.dimitrov.75@gmail.com> Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: --- src/stkutil.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/stkutil.c b/src/stkutil.c index 066731c9..b6d4b537 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -1862,6 +1862,10 @@ static bool parse_dataobj_mms_reference(struct comprehension_tlv_iter *iter, data = comprehension_tlv_iter_get_data(iter); mr->len = len; + + if (len > sizeof(mr->ref)) + return false; + memcpy(mr->ref, data, len); return true; From patchwork Tue Dec 3 19:43:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Dimitrov X-Patchwork-Id: 13892847 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 C7EFE1F9F6C for ; Tue, 3 Dec 2024 19:44:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733255057; cv=none; b=sXD0Yq6JRVqzeCGAhgOImQr8L7zVPP2lJdR5B+oYOaZ9Svy1q4QV8nuwqGXuTgT/ZwiC2TqahGoWVF4HkLfpBQv0p35kIBAhzWvPwDgsd9L+aGku1bl7A1AgV4uYhgHcHsg2C4+BaohOCfFiEIOQytv1aqruFkacLeI8xz0UgBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733255057; c=relaxed/simple; bh=BTVaqKaAQB5Tu+fmCiuOsa+Ay/sLpOObPJfduIULhIY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=WwrV8Zc6ulWLWcdUc2p8dHdvkiYXnHvGzvZSRRn3DnNQrOWau0Ueb7LdvwSvdBM7WdJdpd2NiomfNU7RVcYX5rMNdlwoypMbP658S1PcGeoJlFid7+8U5zEJ3qIDbagIg0OW1IO/nGeaMZdTq9jO012MYL35W6fYbjfkUR91qtI= 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=KQvSGS89; arc=none smtp.client-ip=209.85.128.45 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="KQvSGS89" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-434b3e32e9dso51219255e9.2 for ; Tue, 03 Dec 2024 11:44:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733255054; x=1733859854; darn=lists.linux.dev; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=wMEMvB9DlDjSIlO2U8i9kdXJH8p6on7s+kWTJXfZZyQ=; b=KQvSGS89+6t/ALoWgDUM23goWHzBE6nCsFSf0jN62u9vjFvh4Cg2n94riJ/Prw8DGh Pzqe02H04B/hhzmzSI+wLOr+mw2wiaAA0sMoP88jWCfVsYrozS+KP1mGvNOHuaquQ60R 7H75hMy9Q2nzZMqO2E3eNNvqGSrJzUXk8dUssjjXjEmrfrCkopOtCixFmGb8qLMlOLEq gymBiyWngEVfzRYNwNkDY2Rm5E/eHDBPUKnU+p017opE/UKTTP38OxFm3AYTbEJA40Wv SE+cBr/SGnE6v52GsFQsNgZl7erdz51uB8Kz/SMfc4dUUgByI+xbIexgImLXKNOsWhWr nFDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733255054; x=1733859854; h=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=wMEMvB9DlDjSIlO2U8i9kdXJH8p6on7s+kWTJXfZZyQ=; b=coPRJXoX/l6SALd+wbXhbbEwknK9lbCWNHvPaYXzaH7aWz+bOlgNAZTSNOG0bKL0YG LFAgPNch9ArHUQyleyn/SFD4XCi9J3Vb9ZcnwUWFm8qpnSQFveIrkNcuHP5mYxgZCRSP M+wmw8PHcPcHT3AmF2IBpROZoVTKP+tfEuDUBndP3tq+BbyiutZ7uc3f6YFbxcW+FAfO wn/lXctP7j4a1RtrZaBLcBu0XndswCx0X61mQXEHFaFyhZCoisISMbmrfpErEHBKHHkg sad/7+G+ks8EVC1mFDuNF59NkaysbsCxxIQ01p+GnNAcfY/fWtCFENGDpwZrS+ASDWxN yQnA== X-Gm-Message-State: AOJu0YwLBLVnxGFXYcCYINi2OV6feXG0/sRKt9FE77DAI57SZKN39BUt cmUYeW3cVQpswhAJKny+eMU3QD1Sz1Gf65UXzc2olSNMXDGcgHFDE5TYCg== X-Gm-Gg: ASbGncuqTQwu5XX1yVoBupmTxxxoqxYpB4TlxBDAHnl6pM3aUNclEfLWM5Q6ea1pXZC 13eisOpgMXBQ2kPVV8u5SLAfFZupe+dz5LMlY/s1qO8vuLUdTH3MwtHyRvZ6Ol4fJdqlBQTJ/59 xA6Kr1JzM5nA8LL95tHBjMrrPjQ3kSwQGfulbC+rKbDqwtIKDaD+kR15VKiDKGIAD88hpi54w8H GglkXNWNUK1Abl5Z6YHss2miMNgm6bwvpM9ls876tYtGRskrNOzrtahKFpLpM/LoJzzSYK2 X-Google-Smtp-Source: AGHT+IFzKu5QRJhQNR2HOmiRguQ0rz6UfY1aaff1gq+lypOtUKFfP/0F618YDhlGMXpmkaNR6YQU3w== X-Received: by 2002:a05:600c:5799:b0:434:a202:7a0d with SMTP id 5b1f17b1804b1-434d0a03456mr32809485e9.22.1733255054026; Tue, 03 Dec 2024 11:44:14 -0800 (PST) Received: from localhost.localdomain ([95.43.220.235]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434b0d9bec1sm204553455e9.5.2024.12.03.11.44.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 11:44:13 -0800 (PST) From: Ivaylo Dimitrov To: ofono@lists.linux.dev Cc: denkenz@gmail.com, absicsz@gmail.com, merlijn@wizzup.org, Ivaylo Dimitrov Subject: [PATCH 3/4] Fix CVE-2024-7547 Date: Tue, 3 Dec 2024 21:43:51 +0200 Message-Id: <20241203194352.25514-3-ivo.g.dimitrov.75@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20241203194352.25514-1-ivo.g.dimitrov.75@gmail.com> References: <20241203194352.25514-1-ivo.g.dimitrov.75@gmail.com> Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: --- src/smsutil.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/smsutil.c b/src/smsutil.c index 8f578c22..484bfd0b 100644 --- a/src/smsutil.c +++ b/src/smsutil.c @@ -1464,6 +1464,9 @@ static gboolean decode_command(const unsigned char *pdu, int len, if ((len - offset) < out->command.cdl) return FALSE; + if (out->command.cdl > sizeof(out->command.cd)) + return FALSE; + memcpy(out->command.cd, pdu + offset, out->command.cdl); return TRUE; From patchwork Tue Dec 3 19:43:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Dimitrov X-Patchwork-Id: 13892848 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 6C1727E0E8 for ; Tue, 3 Dec 2024 19:44:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733255059; cv=none; b=oAFOOhIiEdrprNMH1Nawx7pZJrcTgaqfzDis7znHy6cE/Luxnq++ysZaeQZSgJzznYhN0eUFd0vdwfyujl8Fi2kFdTEY1RDwiX1k+K48O/mr88dRPTuw2FaIzbaZNhxlGCb8wiOn4vtY9qp5eovudOITuTjVGhKfhWRIQ9z3Kfk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733255059; c=relaxed/simple; bh=IRIL/GOKQvcgbvEiU8d4wrLR9iKQNogzDGPLAMiqcu8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=ZCYyh7ZpuVItR4QenRoc1eL3ZhUyVOaYzXN6d6NN3UfjYWEdeSM3WxFhMAMM9wOGdPfHx6Zt1sNvxGsEc1XMwsRXN1xydcM9C70dfhp0Xc4QEZJXuIVm2W4lA8n2SfLCdzomaWU+MRR7uNCL5KGB/It1iamfBTHQRJYM//nTzg0= 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=fy0MJZBZ; arc=none smtp.client-ip=209.85.128.50 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="fy0MJZBZ" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-434a10588f3so38918855e9.1 for ; Tue, 03 Dec 2024 11:44:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733255056; x=1733859856; darn=lists.linux.dev; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=1iyTjOnk3TKGPqT2lEip6M3QDnQ9cCVcCLqXorjjOHk=; b=fy0MJZBZ5LmPUPLiL3gPr88KIck+VWx0s5tKegCwFtfUUhGDkJNJYjfVJXwitGN4Yu PXGDsPAhBsC7w07XoZHZDhy23FQlyiPtVM5sidH3VBQQsGb4eGXpxWG6URciFhvMsoFA 2Lu4tw+wQ5/gjVuNxUVXyoo3bQHpaJqKXidgpa+i47tNB6Cd82hYDe/EtI4+VfX7jJIt kXUwQVgOb3HpsPz8Q2JEd3sad1AsuEvv+VKtocUtjkTrS652B/PRal89XaeQ/xQkwy+5 IkxfqPHzjIBp7GOvyQELmvaWiPHh6LNYm4x4l+xcb5gz0yCkhGMR0WmV2D1JZRb0zyDj JLYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733255056; x=1733859856; h=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=1iyTjOnk3TKGPqT2lEip6M3QDnQ9cCVcCLqXorjjOHk=; b=M+mRBxl1EEGDEs5ThPvsXyM4znO2bCpX5Nv1R4TEi44tbcJHLk79AUawySPToYzfEd lpT2s7NYhUO73HTq5Ft/va1QDjyjWw5JzwYaxBvnJbBVfjDNDLP3DETPWwRHnvAm8fIy Vu6lHMkctIaDwHz0pxmAjmB27pRwywhtpHowoLDWhtBESOGRHWnrTfaL9k3s4Q0Vs1rN PPR3lh/LvTqCryIPdI6x7MOuYq1rnG5lwLjHKHVMGzZFdY78PrLGHHtDNa38/OnyGtue jta3K2XflRNarYR1iC79afL+WCJUtWbej6AZrNqD4HC74iXrX06Tztt5BxXoMcPyiHcn mvoA== X-Gm-Message-State: AOJu0YwOZoNoD9ajPnK/SPAgDwJPcmDLBPwOaeg9+PcNegA7RYcI+NjC 0w3vng1MR/a/TGbS4Xs25R+5kjCY9HWFKgx1ddy1O+rrpOjkoGcGq+3+EQ== X-Gm-Gg: ASbGnctHRMTQpdlnitwT7oJhuWHWt+Xx6279pFvez5XXaa7MZJQWyD7vBvAdNnLTVks IXObxuqtM8eW1PV9QO50QIoZOgvmDn+0KdHYP1/c+txXxMklB/fx41vIN8GzFRV2swQCLWh0ilz uA0MyIPyOwPMfpm+zYmy2RYlrHh8pg04a3y0aZZan0dsKLr2u/bw9W0JsIQxM12n9jTjOVl/UjP jZGXZsn11JRZsRW+kXTrUO/04+bXnudwBKDZADah6CC0rkxP6ox41934y5xXb/4FhbRIZWO X-Google-Smtp-Source: AGHT+IG02zSh45hUjSbsh+Il9EtOOeII2OlRte5iDcQebAj0zUa/7sVf45ip+t97qX+SNC8Rr4OqBA== X-Received: by 2002:a05:600c:1c0b:b0:42c:ba83:3f01 with SMTP id 5b1f17b1804b1-434d3fa01demr14372175e9.8.1733255055495; Tue, 03 Dec 2024 11:44:15 -0800 (PST) Received: from localhost.localdomain ([95.43.220.235]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434b0d9bec1sm204553455e9.5.2024.12.03.11.44.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 11:44:15 -0800 (PST) From: Ivaylo Dimitrov To: ofono@lists.linux.dev Cc: denkenz@gmail.com, absicsz@gmail.com, merlijn@wizzup.org, Ivaylo Dimitrov Subject: [PATCH 4/4] Fix CVE-2024-7546 Date: Tue, 3 Dec 2024 21:43:52 +0200 Message-Id: <20241203194352.25514-4-ivo.g.dimitrov.75@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20241203194352.25514-1-ivo.g.dimitrov.75@gmail.com> References: <20241203194352.25514-1-ivo.g.dimitrov.75@gmail.com> Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: --- src/stkutil.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/stkutil.c b/src/stkutil.c index b6d4b537..c8497c4c 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -1769,6 +1769,10 @@ static bool parse_dataobj_frame_layout(struct comprehension_tlv_iter *iter, fl->layout = data[0]; fl->len = len - 1; + + if (fl->len > sizeof(fl->size)) + return false; + memcpy(fl->size, data + 1, fl->len); return true;