cec-api: prevent leaking memory through hole in structure
[ Upstream commit 6c42227c34
]
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 <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
parent
bd45930303
commit
6734eeb6c2
|
@ -147,7 +147,13 @@ static long cec_adap_g_log_addrs(struct cec_adapter *adap,
|
||||||
struct cec_log_addrs log_addrs;
|
struct cec_log_addrs log_addrs;
|
||||||
|
|
||||||
mutex_lock(&adap->lock);
|
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)
|
if (!adap->is_configured)
|
||||||
memset(log_addrs.log_addr, CEC_LOG_ADDR_INVALID,
|
memset(log_addrs.log_addr, CEC_LOG_ADDR_INVALID,
|
||||||
sizeof(log_addrs.log_addr));
|
sizeof(log_addrs.log_addr));
|
||||||
|
|
Loading…
Reference in New Issue