Commit 338e17d3 authored by Joey Pabalinas's avatar Joey Pabalinas Committed by Takashi Iwai

ALSA: ice1712: replace strcpy() with strlcpy()

Replace unsafe usages of strcpy() to copy the name
argument into the sid.name buffer with strlcpy()
to guard against possible buffer overflows.
Signed-off-by: default avatarJoey Pabalinas <joeypabalinas@gmail.com>
Suggested-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent dd5f313b
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/string.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/tlv.h> #include <sound/tlv.h>
...@@ -425,10 +426,9 @@ DECLARE_TLV_DB_SCALE(juli_master_db_scale, -6350, 50, 1); ...@@ -425,10 +426,9 @@ DECLARE_TLV_DB_SCALE(juli_master_db_scale, -6350, 50, 1);
static struct snd_kcontrol *ctl_find(struct snd_card *card, static struct snd_kcontrol *ctl_find(struct snd_card *card,
const char *name) const char *name)
{ {
struct snd_ctl_elem_id sid; struct snd_ctl_elem_id sid = {0};
memset(&sid, 0, sizeof(sid));
/* FIXME: strcpy is bad. */ strlcpy(sid.name, name, sizeof(sid.name));
strcpy(sid.name, name);
sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER; sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
return snd_ctl_find_id(card, &sid); return snd_ctl_find_id(card, &sid);
} }
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/string.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/tlv.h> #include <sound/tlv.h>
#include <sound/info.h> #include <sound/info.h>
...@@ -785,10 +786,9 @@ DECLARE_TLV_DB_SCALE(qtet_master_db_scale, -6350, 50, 1); ...@@ -785,10 +786,9 @@ DECLARE_TLV_DB_SCALE(qtet_master_db_scale, -6350, 50, 1);
static struct snd_kcontrol *ctl_find(struct snd_card *card, static struct snd_kcontrol *ctl_find(struct snd_card *card,
const char *name) const char *name)
{ {
struct snd_ctl_elem_id sid; struct snd_ctl_elem_id sid = {0};
memset(&sid, 0, sizeof(sid));
/* FIXME: strcpy is bad. */ strlcpy(sid.name, name, sizeof(sid.name));
strcpy(sid.name, name);
sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER; sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
return snd_ctl_find_id(card, &sid); return snd_ctl_find_id(card, &sid);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment