Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 212ac181 authored by Zubin Mithra's avatar Zubin Mithra Committed by Takashi Iwai
Browse files

ALSA: seq: Fix OOB-reads from strlcpy 



When ioctl calls are made with non-null-terminated userspace strings,
strlcpy causes an OOB-read from within strlen. Fix by changing to use
strscpy instead.

Signed-off-by: default avatarZubin Mithra <zsm@chromium.org>
Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8b030a57

sound/core/seq/seq_clientmgr.c

+3 −3
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ static int snd_seq_ioctl_set_client_info(struct snd_seq_client *client, 


	/* fill the info fields */

	if (client_info->name[0])

		strlcpy(client->name, client_info->name, sizeof(client->name));

		strscpy(client->name, client_info->name, sizeof(client->name));



	client->filter = client_info->filter;

	client->event_lost = client_info->event_lost;
@@ -1530,7 +1530,7 @@ static int snd_seq_ioctl_create_queue(struct snd_seq_client *client, void *arg) 
	/* set queue name */

	if (!info->name[0])

		snprintf(info->name, sizeof(info->name), "Queue-%d", q->queue);

	strlcpy(q->name, info->name, sizeof(q->name));

	strscpy(q->name, info->name, sizeof(q->name));

	snd_use_lock_free(&q->use_lock);



	return 0;
@@ -1592,7 +1592,7 @@ static int snd_seq_ioctl_set_queue_info(struct snd_seq_client *client, 
		queuefree(q);

		return -EPERM;

	}

	strlcpy(q->name, info->name, sizeof(q->name));

	strscpy(q->name, info->name, sizeof(q->name));

	queuefree(q);



	return 0;