Skip to contentSkip to conversation

ASoC: Intel: Fix incorrect sizeof() in sst_hsw_stream_get_volume()

PATCH Applied Christian Engelmayer 3 participants 5 messages Apr 13, 2014 – Apr 18, 2014

Subsystems (4)
Sound Kernel janitors ASoC Intel ASoC drivers
lore
Share & tools
lore

Christian Engelmayer

author
#0 lore raw

PATCH 1/1 ASoC: Intel: Fix incorrect sizeof() in sst_hsw_stream_get_volume()

Fix an incorrect sizeof() usage in sst_hsw_stream_get_volume(). sst_dsp_read() is called to read into a variable of type u32, but is passed sizeof(u32 *) for argument 'size_t bytes'. Detected by Coverity: CID 1195260.

Signed-off-by Christian Engelmayer <[email protected]>
---
 sound/soc/intel/sst-haswell-ipc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/intel/sst-haswell-ipc.c +2 -1
index f46bb4d..455a185 100644
@@ -991,7 +991,8 @@ int sst_hsw_stream_get_volume(struct sst_hsw *hsw, struct sst_hsw_stream *stream
 		return -EINVAL;
 
 	sst_dsp_read(hsw->dsp, volume,
-		stream->reply.volume_register_address[channel], sizeof(volume));
+		stream->reply.volume_register_address[channel],
+		sizeof(*volume));
 
 	return 0;
 }
Signature · 1 line
1.8.3.2
maintainer Applied
#1 lore raw
Quoted 3 lines · Christian Engelmayer

Fix an incorrect sizeof() usage in sst_hsw_stream_get_volume(). sst_dsp_read() is called to read into a variable of type u32, but is passed sizeof(u32 *) for argument 'size_t bytes'. Detected by Coverity: CID 1195260.

Applied, thanks.

#2 lore raw
In reply to Christian Engelmayer
Quoted 5 lines · Christian Engelmayer

Fix an incorrect sizeof() usage in sst_hsw_stream_get_volume(). sst_dsp_read() is called to read into a variable of type u32, but is passed sizeof(u32 *) for argument 'size_t bytes'. Detected by Coverity: CID 1195260.

Signed-off-by Christian Engelmayer <[email protected]>

There are a couple others in this file. I introduced one of them. :( Sorry about that. I'll send a patch for that.

regards,
dan carpenter

#3 lore raw

PATCH 1/1 ASoC: Intel: some incorrect sizeof() usages

In reply to Christian Engelmayer

The intent was to say "sizeof(*pos)" and not "sizeof(pos)".

The sizeof(*pos) is 8 bytes so the bug won't show up on 64 bit systems. The sizeof(*dx) is 172 bytes so that will be a bugfix.

Signed-off-by Dan Carpenter <[email protected]>

---
Static analysis. Not tested.

sound/soc/intel/sst-haswell-ipc.c +2 -2
index f46bb4d..4ed2d17 100644
@@ -617,7 +617,7 @@ static void hsw_notification_work(struct work_struct *work)
 	case IPC_POSITION_CHANGED:
 		trace_ipc_notification("DSP stream position changed for",
 			stream->reply.stream_hw_id);
-		sst_dsp_inbox_read(hsw->dsp, pos, sizeof(pos));
+		sst_dsp_inbox_read(hsw->dsp, pos, sizeof(*pos));
 
 		if (stream->notify_position)
 			stream->notify_position(stream, stream->pdata);

@@ -1609,7 +1609,7 @@ int sst_hsw_dx_set_state(struct sst_hsw *hsw,
 	trace_ipc_request("PM enter Dx state", state);
 
 	ret = ipc_tx_message_wait(hsw, header, &state_, sizeof(state_),
-		dx, sizeof(dx));
+		dx, sizeof(*dx));
 	if (ret < 0) {
 		dev_err(hsw->dev, "ipc: error set dx state %d failed\n", state);
 		return ret;
maintainer Applied
#4 lore raw

Re: [patch] ASoC: Intel: some incorrect sizeof() usages

Quoted 4 lines · Dan Carpenter

The intent was to say "sizeof(*pos)" and not "sizeof(pos)".

The sizeof(*pos) is 8 bytes so the bug won't show up on 64 bit systems. The sizeof(*dx) is 172 bytes so that will be a bugfix.

Applied, thanks.