Commit edbcf872 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: seq: core: Use automatic cleanup of kfree() 



There are common patterns where a temporary buffer is allocated and
freed at the exit, and those can be simplified with the recent cleanup
mechanism via __free(kfree).

No functional changes, only code refactoring.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20240222111509.28390-10-tiwai@suse.de
parent 316e38ef

sound/core/seq/seq_compat.c

+5 −7
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ struct snd_seq_port_info32 { 
static int snd_seq_call_port_info_ioctl(struct snd_seq_client *client, unsigned int cmd,

					struct snd_seq_port_info32 __user *data32)

{

	int err = -EFAULT;

	struct snd_seq_port_info *data;

	struct snd_seq_port_info *data __free(kfree) = NULL;

	int err;



	data = kmalloc(sizeof(*data), GFP_KERNEL);

	if (!data)
@@ -41,20 +41,18 @@ static int snd_seq_call_port_info_ioctl(struct snd_seq_client *client, unsigned 
	if (copy_from_user(data, data32, sizeof(*data32)) ||

	    get_user(data->flags, &data32->flags) ||

	    get_user(data->time_queue, &data32->time_queue))

		goto error;

		return -EFAULT;

	data->kernel = NULL;



	err = snd_seq_kernel_client_ctl(client->number, cmd, data);

	if (err < 0)

		goto error;

		return err;



	if (copy_to_user(data32, data, sizeof(*data32)) ||

	    put_user(data->flags, &data32->flags) ||

	    put_user(data->time_queue, &data32->time_queue))

		err = -EFAULT;

		return -EFAULT;



 error:

	kfree(data);

	return err;

}

sound/core/seq/seq_midi.c

+3 −11
Original line number Diff line number Diff line
@@ -270,8 +270,8 @@ snd_seq_midisynth_probe(struct device *_dev) 
	struct snd_seq_device *dev = to_seq_dev(_dev);

	struct seq_midisynth_client *client;

	struct seq_midisynth *msynth, *ms;

	struct snd_seq_port_info *port;

	struct snd_rawmidi_info *info;

	struct snd_seq_port_info *port __free(kfree) = NULL;

	struct snd_rawmidi_info *info __free(kfree) = NULL;

	struct snd_rawmidi *rmidi = dev->private_data;

	int newclient = 0;

	unsigned int p, ports;
@@ -297,10 +297,8 @@ snd_seq_midisynth_probe(struct device *_dev) 
	ports = output_count;

	if (ports < input_count)

		ports = input_count;

	if (ports == 0) {

		kfree(info);

	if (ports == 0)

		return -ENODEV;

	}

	if (ports > (256 / SNDRV_RAWMIDI_DEVICES))

		ports = 256 / SNDRV_RAWMIDI_DEVICES;
@@ -311,7 +309,6 @@ snd_seq_midisynth_probe(struct device *_dev) 
		client = kzalloc(sizeof(*client), GFP_KERNEL);

		if (client == NULL) {

			mutex_unlock(&register_mutex);

			kfree(info);

			return -ENOMEM;

		}

		client->seq_client =
@@ -321,7 +318,6 @@ snd_seq_midisynth_probe(struct device *_dev) 
		if (client->seq_client < 0) {

			kfree(client);

			mutex_unlock(&register_mutex);

			kfree(info);

			return -ENOMEM;

		}

	}
@@ -403,8 +399,6 @@ snd_seq_midisynth_probe(struct device *_dev) 
	if (newclient)

		synths[card->number] = client;

	mutex_unlock(&register_mutex);

	kfree(info);

	kfree(port);

	return 0;	/* success */



      __nomem:
@@ -417,8 +411,6 @@ snd_seq_midisynth_probe(struct device *_dev) 
		snd_seq_delete_kernel_client(client->seq_client);

		kfree(client);

	}

	kfree(info);

	kfree(port);

	mutex_unlock(&register_mutex);

	return -ENOMEM;

}