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

Commit 46599148 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ANDROID: sound: rawmidi: Hold lock around realloc"

parents ab670d35 b68f2a90

include/sound/rawmidi.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ struct snd_rawmidi_runtime { 
	size_t xruns;		/* over/underruns counter */

	/* misc */

	spinlock_t lock;

	struct mutex realloc_mutex;

	wait_queue_head_t sleep;

	/* event handler (new bytes, input only) */

	void (*event)(struct snd_rawmidi_substream *substream);

sound/core/rawmidi.c

+39 −5
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ static int snd_rawmidi_runtime_create(struct snd_rawmidi_substream *substream) 
		return -ENOMEM;

	runtime->substream = substream;

	spin_lock_init(&runtime->lock);

	mutex_init(&runtime->realloc_mutex);

	init_waitqueue_head(&runtime->sleep);

	INIT_WORK(&runtime->event_work, snd_rawmidi_input_event_work);

	runtime->event = NULL;
@@ -637,7 +638,9 @@ int snd_rawmidi_output_params(struct snd_rawmidi_substream *substream, 
			      struct snd_rawmidi_params * params)

{

	char *newbuf;

	char *oldbuf;

	struct snd_rawmidi_runtime *runtime = substream->runtime;

	unsigned long flags;



	if (substream->append && substream->use_count > 1)

		return -EBUSY;
@@ -649,13 +652,22 @@ int snd_rawmidi_output_params(struct snd_rawmidi_substream *substream, 
		return -EINVAL;

	}

	if (params->buffer_size != runtime->buffer_size) {

		newbuf = krealloc(runtime->buffer, params->buffer_size,

		mutex_lock(&runtime->realloc_mutex);

		newbuf = __krealloc(runtime->buffer, params->buffer_size,

				  GFP_KERNEL);

		if (!newbuf)

		if (!newbuf) {

			mutex_unlock(&runtime->realloc_mutex);

			return -ENOMEM;

		}

		spin_lock_irqsave(&runtime->lock, flags);

		oldbuf = runtime->buffer;

		runtime->buffer = newbuf;

		runtime->buffer_size = params->buffer_size;

		runtime->avail = runtime->buffer_size;

		spin_unlock_irqrestore(&runtime->lock, flags);

		if (oldbuf != newbuf)

			kfree(oldbuf);

		mutex_unlock(&runtime->realloc_mutex);

	}

	runtime->avail_min = params->avail_min;

	substream->active_sensing = !params->no_active_sensing;
@@ -667,7 +679,9 @@ int snd_rawmidi_input_params(struct snd_rawmidi_substream *substream, 
			     struct snd_rawmidi_params * params)

{

	char *newbuf;

	char *oldbuf;

	struct snd_rawmidi_runtime *runtime = substream->runtime;

	unsigned long flags;



	snd_rawmidi_drain_input(substream);

	if (params->buffer_size < 32 || params->buffer_size > 1024L * 1024L) {
@@ -677,12 +691,21 @@ int snd_rawmidi_input_params(struct snd_rawmidi_substream *substream, 
		return -EINVAL;

	}

	if (params->buffer_size != runtime->buffer_size) {

		newbuf = krealloc(runtime->buffer, params->buffer_size,

		mutex_lock(&runtime->realloc_mutex);

		newbuf = __krealloc(runtime->buffer, params->buffer_size,

				  GFP_KERNEL);

		if (!newbuf)

		if (!newbuf) {

			mutex_unlock(&runtime->realloc_mutex);

			return -ENOMEM;

		}

		spin_lock_irqsave(&runtime->lock, flags);

		oldbuf = runtime->buffer;

		runtime->buffer = newbuf;

		runtime->buffer_size = params->buffer_size;

		spin_unlock_irqrestore(&runtime->lock, flags);

		if (oldbuf != newbuf)

			kfree(oldbuf);

		mutex_unlock(&runtime->realloc_mutex);

	}

	runtime->avail_min = params->avail_min;

	return 0;
@@ -955,6 +978,8 @@ static long snd_rawmidi_kernel_read1(struct snd_rawmidi_substream *substream, 
	unsigned long appl_ptr;



	spin_lock_irqsave(&runtime->lock, flags);

	if (userbuf)

		mutex_lock(&runtime->realloc_mutex);

	while (count > 0 && runtime->avail) {

		count1 = runtime->buffer_size - runtime->appl_ptr;

		if (count1 > count)
@@ -974,6 +999,7 @@ static long snd_rawmidi_kernel_read1(struct snd_rawmidi_substream *substream, 
			spin_unlock_irqrestore(&runtime->lock, flags);

			if (copy_to_user(userbuf + result,

					 runtime->buffer + appl_ptr, count1)) {

				mutex_unlock(&runtime->realloc_mutex);

				return result > 0 ? result : -EFAULT;

			}

			spin_lock_irqsave(&runtime->lock, flags);
@@ -982,6 +1008,8 @@ static long snd_rawmidi_kernel_read1(struct snd_rawmidi_substream *substream, 
		count -= count1;

	}

	spin_unlock_irqrestore(&runtime->lock, flags);

	if (userbuf)

		mutex_unlock(&runtime->realloc_mutex);

	return result;

}
@@ -1246,10 +1274,14 @@ static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream, 
		return -EINVAL;



	result = 0;

	if (userbuf)

		mutex_lock(&runtime->realloc_mutex);

	spin_lock_irqsave(&runtime->lock, flags);

	if (substream->append) {

		if ((long)runtime->avail < count) {

			spin_unlock_irqrestore(&runtime->lock, flags);

			if (userbuf)

				mutex_unlock(&runtime->realloc_mutex);

			return -EAGAIN;

		}

	}
@@ -1285,6 +1317,8 @@ static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream, 
      __end:

	count1 = runtime->avail < runtime->buffer_size;

	spin_unlock_irqrestore(&runtime->lock, flags);

	if (userbuf)

		mutex_unlock(&runtime->realloc_mutex);

	if (count1)

		snd_rawmidi_output_trigger(substream, 1);

	return result;