Commit c3ea60c2 authored by Colin Ian King's avatar Colin Ian King Committed by Takashi Iwai
Browse files

ALSA: seq: fix incorrect order of dest_client/dest_ports arguments 



There are two occurrances of a call to snd_seq_oss_fill_addr where
the dest_client and dest_port arguments are in the wrong order. Fix
this by swapping them around.

Addresses-Coverity: ("Arguments in wrong order")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bef33e19

sound/core/seq/oss/seq_oss_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int snd_seq_oss_oob_user(struct seq_oss_devinfo *dp, void __user *arg) 
	if (copy_from_user(ev, arg, 8))

		return -EFAULT;

	memset(&tmpev, 0, sizeof(tmpev));

	snd_seq_oss_fill_addr(dp, &tmpev, dp->addr.port, dp->addr.client);

	snd_seq_oss_fill_addr(dp, &tmpev, dp->addr.client, dp->addr.port);

	tmpev.time.tick = 0;

	if (! snd_seq_oss_process_event(dp, (union evrec *)ev, &tmpev)) {

		snd_seq_oss_dispatch(dp, &tmpev, 0, 0);

sound/core/seq/oss/seq_oss_rw.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ insert_queue(struct seq_oss_devinfo *dp, union evrec *rec, struct file *opt) 
	memset(&event, 0, sizeof(event));

	/* set dummy -- to be sure */

	event.type = SNDRV_SEQ_EVENT_NOTEOFF;

	snd_seq_oss_fill_addr(dp, &event, dp->addr.port, dp->addr.client);

	snd_seq_oss_fill_addr(dp, &event, dp->addr.client, dp->addr.port);



	if (snd_seq_oss_process_event(dp, rec, &event))

		return 0; /* invalid event - no need to insert queue */

CRA Git | Maintained and supported by SUSTech CRA and CCSE