| From: Colin Ian King <colin.king@canonical.com> |
| Date: Fri, 28 Jun 2019 10:54:29 +0100 |
| Subject: ALSA: seq: fix incorrect order of dest_client/dest_ports arguments |
| |
| commit c3ea60c231446663afd6ea1054da6b7f830855ca upstream. |
| |
| 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: Colin Ian King <colin.king@canonical.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| sound/core/seq/oss/seq_oss_ioctl.c | 2 +- |
| sound/core/seq/oss/seq_oss_rw.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/sound/core/seq/oss/seq_oss_ioctl.c |
| +++ b/sound/core/seq/oss/seq_oss_ioctl.c |
| @@ -62,7 +62,7 @@ static int snd_seq_oss_oob_user(struct s |
| 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); |
| --- a/sound/core/seq/oss/seq_oss_rw.c |
| +++ b/sound/core/seq/oss/seq_oss_rw.c |
| @@ -174,7 +174,7 @@ insert_queue(struct seq_oss_devinfo *dp, |
| 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 */ |
