Unverified Commit 83b361e2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15061 ALSA: seq: oss: Fix races at processing SysEx messages 

Merge Pull Request from: @ci-robot 
 
PR sync from: Gu Bowen <gubowen5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2PX3Y3J7266O7VYDTQWVLXBO7XKDYK44/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBID2T 
 
Link:https://gitee.com/openeuler/kernel/pulls/15061

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 7152a244 8ace1626

sound/core/seq/oss/seq_oss_synth.c

+17 −6
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static struct seq_oss_synth midi_synth_dev = { 
};



static DEFINE_SPINLOCK(register_lock);

static DEFINE_MUTEX(sysex_mutex);



/*

 * prototypes
@@ -491,16 +492,20 @@ snd_seq_oss_synth_sysex(struct seq_oss_devinfo *dp, int dev, unsigned char *buf, 
	unsigned char *dest;

	struct seq_oss_synth_sysex *sysex;

	struct seq_oss_synthinfo *info;

	int err = -EINVAL;



	info = snd_seq_oss_synth_info(dp, dev);

	if (!info)

		return -ENXIO;



	mutex_lock(&sysex_mutex);

	sysex = info->sysex;

	if (sysex == NULL) {

		sysex = kzalloc(sizeof(*sysex), GFP_KERNEL);

		if (sysex == NULL)

			return -ENOMEM;

		if (sysex == NULL) {

			err = -ENOMEM;

			goto unlock_sysex;

		}

		info->sysex = sysex;

	}
@@ -525,19 +530,25 @@ snd_seq_oss_synth_sysex(struct seq_oss_devinfo *dp, int dev, unsigned char *buf, 
		if (sysex->skip) {

			sysex->skip = 0;

			sysex->len = 0;

			return -EINVAL; /* skip */

			err = -EINVAL; /* skip */

			goto unlock_sysex;

		}

		/* copy the data to event record and send it */

		ev->flags = SNDRV_SEQ_EVENT_LENGTH_VARIABLE;

		if (snd_seq_oss_synth_addr(dp, dev, ev))

			return -EINVAL;

		if (snd_seq_oss_synth_addr(dp, dev, ev)) {

			err = -EINVAL;

			goto unlock_sysex;

		}

		ev->data.ext.len = sysex->len;

		ev->data.ext.ptr = sysex->buf;

		sysex->len = 0;

		mutex_unlock(&sysex_mutex);

		return 0;

	}



	return -EINVAL; /* skip */

unlock_sysex:

	mutex_unlock(&sysex_mutex);

	return err; /* skip */

}



/*