Commit 46a049da authored Jan 11, 2017 by Arnd Bergmann Committed by Takashi Iwai Jan 11, 2017

ALSA: hda/ca0132 - fix possible NULL pointer use

gcc-7 caught what it considers a NULL pointer dereference:

sound/pci/hda/patch_ca0132.c: In function 'dspio_scp.constprop':
sound/pci/hda/patch_ca0132.c:1487:4: error: argument 1 null where non-null expected [-Werror=nonnull]

This is plausible from looking at the function, as we compare 'reply'
to NULL earlier in it. I have not tried to analyze if there are constraints
that make it impossible to hit the bug, but adding another NULL check in
the end kills the warning and makes the function more robust.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 92128236

sound/pci/hda/patch_ca0132.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1482,6 +1482,9 @@ static int dspio_scp(struct hda_codec *codec,
		} else if (ret_size != reply_data_size) {
		codec_dbg(codec, "RetLen and HdrLen .NE.\n");
		return -EINVAL;
		} else if (!reply) {
		codec_dbg(codec, "NULL reply\n");
		return -EINVAL;
		} else {
		reply_len = ret_sizesizeof(unsigned int);
		memcpy(reply, scp_reply.data, *reply_len);

Admin message