From nobody Tue Dec 23 14:22:02 2025 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 F310F231A30 for ; Mon, 13 Jan 2025 06:19:16 +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=1736749159; cv=none; b=C+4RYG39KWflk8uZCG669FhUCADgD8+IKBHUNaM99RUe+WYOIiVx3L0sGmlpa60wmzVvO9yFmpQmWvXYzNAfGoh9yaHc/0oqrWOSy6GZOKqjTH/qekbTJaYRt8qBth4gUgU/WFiz3dwqrNnrnzENAvw+/KbKkyfQo3AMymcKOr8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736749159; c=relaxed/simple; bh=JS+4J5lh8Fucg3Gbhf9aAPZyh0H2XmOy45D+czstqF0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=QB5LQCY26DWNdUXygd/YeUHYRwazc9e/vkAG3YINQAkbHIz8WUKLkjQs6fCnO5i9h0RqXvyvSzddjpeU5ZwxqpJAgeMRgCq8WbuJqY+fRgRAhAcXYVyAd8rVpIXu3CI2T8cboqPDlz+e0ws6bXXmZnSEoX62k8SprRd6hhJyCUo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=VttzT19s; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="VttzT19s" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-aa67333f7d2so597359566b.0 for ; Sun, 12 Jan 2025 22:19:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736749155; x=1737353955; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=IsRvXHGSWUxVyT3HvHK3zRMHjp5k3n6wAVlQb9UAIoo=; b=VttzT19s66sUUcMCO9MYS2mBazY2P2Ck+IqK7m/+bmpljh4he/aEoMagid9FIOR8iM Uoed4Btr2vfkfCO7HNPO2sYVLmMs2SOdxNzq/m2fmcIySwfmeN/UletaUa9sVWGsd+DQ nZtAmlBHOnhP/C9L5WbcUNIhuvftBGF0KHvPQRFma5Bh03HyzWyQkai2bQd9Zzox3v3K V38kh0LQ66EJOSVa0m6dVV1OzHhblIJfjoa76QQMm83w8XCKVp6WS5ZpKW64ZnxW7YjX kOxGDonShA/XD99/SjhOjPyPg07RSAFjGGCM42xMiI7WTy6Wvbx3o4GXz5Q6iDNZt0wc MAXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736749155; x=1737353955; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IsRvXHGSWUxVyT3HvHK3zRMHjp5k3n6wAVlQb9UAIoo=; b=IdJgmDEwrlkJXEODJ1w1NXry/N/u8JraCUhYOE5459QHYLeUExThB/aOFTXR/LuOt0 sGinRg0L0idtmWtKdjOrB6aYuKniVI24FyUoW18Q3cdGwcId7Yhhti/lBg4AKHnSdfyP 8TPx1V6yUrKkFLlBKizdf640SNQYgQU+sqeZFJtJtkOZlJo0FUeQUbVvX/8jQub1/Chn qzMxkF0VL5WkK8FH8qrg2h0nW1BtXz5gzhlaaHuMtX1wtGoktXQtkDTs2g7ZSXro2I/t rurDQ/bWSiskVn53CsU/I52VmMQs0rA0WXTWvA7udwB/huScyixNlQNBnX4bUlZWv/KJ Kc3Q== X-Forwarded-Encrypted: i=1; AJvYcCXa+tkVsvwbRIiVujDVhlzrz2z8zXLeEgHPBIjlw2Vpo9nsfptnOuHj70GXuAhlo9bVAa/1ZyuEs/hLGk8=@vger.kernel.org X-Gm-Message-State: AOJu0YzernKCLa6NHrJPBEGSFomvY1AlHUWOWgXVms6UnWUbVqUjXvB9 pB0/NEKckf/epXcBW2rsvHRI+3gATGd7uDBu9eneYPjHhJ/K2ZX7ox5TL9VodJM= X-Gm-Gg: ASbGnctGLjlG1gEKGI9JyiXg1wGTYkjoa5VEWb3d15IlcTpPFYHW7ggyD2TKbOo2Uw0 T+HbvCqUUpwMq9GBRkNCkhKEJZwg3/nPaSVjcHsRwabXCiAv70xDbbhaYqmrcyrpxT7OHwvt9NC KfnQ1OOMzWxlGgrebsj9Mf7VkTKP9y3ILy8jrZtrv987QACnp+t2yVMmN1N0Ylqmki2jWTPbb6H XvVAbBDA7GEM3Xt2mEPSkbTDy/3e8gvEULpNgLyFfrJXgh2UPq0lwf3Bpkt4w== X-Google-Smtp-Source: AGHT+IFqpX9e3c3D8tjbJ4iafdBuamD/RqHrGmivwZIPI4DdokOcWz0agCCvtb6wFgzixam07yQ7Rg== X-Received: by 2002:a17:907:c0d:b0:aaf:1183:ec2c with SMTP id a640c23a62f3a-ab2ab6bfc89mr1610144966b.5.1736749155208; Sun, 12 Jan 2025 22:19:15 -0800 (PST) Received: from localhost ([196.207.164.177]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab2c9060bccsm451648166b.22.2025.01.12.22.19.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2025 22:19:14 -0800 (PST) Date: Mon, 13 Jan 2025 09:19:11 +0300 From: Dan Carpenter To: Michael Halcrow Cc: Tyler Hicks , Andrew Morton , ecryptfs@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] ecryptfs: use struct_size() to prevent in integer overflow Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On 32bit systems the "(sizeof(*msg) + msg->data_len" addition can lead to integer wrapping. Use struct_size() for safety. Fixes: 8bf2debd5f7b ("eCryptfs: introduce device handle for userspace daemo= n communications") Signed-off-by: Dan Carpenter --- fs/ecryptfs/miscdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c index 4e62c3cef70f..88882f96e06f 100644 --- a/fs/ecryptfs/miscdev.c +++ b/fs/ecryptfs/miscdev.c @@ -325,7 +325,7 @@ static int ecryptfs_miscdev_response(struct ecryptfs_da= emon *daemon, char *data, struct ecryptfs_message *msg =3D (struct ecryptfs_message *)data; int rc; =20 - if ((sizeof(*msg) + msg->data_len) !=3D data_size) { + if (struct_size(msg, data, msg->data_len) !=3D data_size) { printk(KERN_WARNING "%s: (sizeof(*msg) + msg->data_len) =3D " "[%zd]; data_size =3D [%zd]. Invalid packet.\n", __func__, (sizeof(*msg) + msg->data_len), data_size); --=20 2.45.2