Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp414177pxa; Fri, 21 Aug 2020 10:26:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZbprc8JmM7xswCBOwMUJoR05+HlGyp/M6SIJB9GQ/7x9CKiSgnM2TtUq3VuC06pd/xYvp X-Received: by 2002:a17:906:a88b:: with SMTP id ha11mr3752197ejb.545.1598030809529; Fri, 21 Aug 2020 10:26:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598030809; cv=none; d=google.com; s=arc-20160816; b=xRM7HA59xVO+nPOGOOO641suA9aWvoeb3SWu8bMKj1K7RBwf4kbBOQfeVmfCoEvCJL 2NA3fQ4hC1ZsJrSUG29cyZFKnss8tmxcNaCWTG/s7j/EYWh0CvbT9V8ZMcSZI37gfv37 o06/tAyxVGZo593VOIxzKfjxTkLKdGL5xPaKXlBEyInNzcc7l/odks8KoMIrjb8oo0i2 HkIuo77XkHSgmLpg61nc5uxoQ4lBzfEQ7RMG1k2BWm66MZKg/e93Q/rOulgkgEOwUZ7P 7nk6Pm+5EFyX/7tIZa+YnMU8aGaItKVganKvu8LDRvh8RnhHC2ZUvishM4HYqMAVGg9R HH1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ekbY6TpA6PScnvOQiosbzD4siP82Nfl/RWvXnL2KKIE=; b=iMOqKJZKeiMYvmZ8jY/geYKA+dXRHvChn1gAy+0wM8cb089S7EJvcyyD+TGu6lBhf7 TIJYi24DBprdLRWtXLeOu/YTWCHcPN5r7tjyBrErgUZW1/MD8DuvUCR2yfMHheTOVti8 FrYxbTysZtY6PcjlDdG9sn7fsA6PCxNhpVALfJnqgs3jBs43yWyer/AfWuw/c4ECe3gS WI2ofJvXC4f84R5oo/S8ntdyouoe7+CZTWqUzwhULPksWwI2OF7NAWnjY8VeElGAZ5Yf P8NEQ7LAIoa/kmeeLHf+EjW21koHB1ZhqWX8T9WU51ijnbpamUQAXaCuBCVJ/7JLFJ8K 21gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rVSHuL6K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q5si1380026edn.508.2020.08.21.10.26.25; Fri, 21 Aug 2020 10:26:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rVSHuL6K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729202AbgHURZc (ORCPT + 99 others); Fri, 21 Aug 2020 13:25:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:48002 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726749AbgHUQPW (ORCPT ); Fri, 21 Aug 2020 12:15:22 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ADBE622B43; Fri, 21 Aug 2020 16:15:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026520; bh=Oq7KjuIEGAsnarIYTg82Iav+HRMBExE8AuCjNT05MZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rVSHuL6Kjgpv+y5tN7wmfq052r5B/ql3ZOXlYpr9w08m7JBAPWcTnPvDLfLQ6wKWH SJKa8fyhoWW9cuTYhMs9fgjUrbRvQN5Oat3LBh+vr8n562eQ8FDgNZ1zxF0n4OYhxm 8zNEtnGDy/ohogCnJjAhGAkldyDP6ldAA7RqY0ko= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.8 44/62] cec-api: prevent leaking memory through hole in structure Date: Fri, 21 Aug 2020 12:14:05 -0400 Message-Id: <20200821161423.347071-44-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821161423.347071-1-sashal@kernel.org> References: <20200821161423.347071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil [ Upstream commit 6c42227c3467549ddc65efe99c869021d2f4a570 ] Fix this smatch warning: drivers/media/cec/core/cec-api.c:156 cec_adap_g_log_addrs() warn: check that 'log_addrs' doesn't leak information (struct has a hole after 'features') Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/cec/core/cec-api.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/media/cec/core/cec-api.c b/drivers/media/cec/core/cec-api.c index 17d1cb2e5f976..f922a2196b2b7 100644 --- a/drivers/media/cec/core/cec-api.c +++ b/drivers/media/cec/core/cec-api.c @@ -147,7 +147,13 @@ static long cec_adap_g_log_addrs(struct cec_adapter *adap, struct cec_log_addrs log_addrs; mutex_lock(&adap->lock); - log_addrs = adap->log_addrs; + /* + * We use memcpy here instead of assignment since there is a + * hole at the end of struct cec_log_addrs that an assignment + * might ignore. So when we do copy_to_user() we could leak + * one byte of memory. + */ + memcpy(&log_addrs, &adap->log_addrs, sizeof(log_addrs)); if (!adap->is_configured) memset(log_addrs.log_addr, CEC_LOG_ADDR_INVALID, sizeof(log_addrs.log_addr)); -- 2.25.1