Commit fe36fa18 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

serial: pic32: free up irq names correctly 



struct pic32_sport contains built-up names for irqs. These are freed
only in error path of pic32_uart_startup(). And even there, the freeing
happens before free_irq().

So fix this by:
* moving frees after free_irq(), and
* add frees to pic32_uart_shutdown() -- the opposite of
  pic32_uart_startup().

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220503063122.20957-11-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28dc5633

drivers/tty/serial/pic32_uart.c

+6 −3
Original line number Diff line number Diff line
@@ -569,14 +569,14 @@ static int pic32_uart_startup(struct uart_port *port) 
	return 0;



out_t:

	kfree(sport->irq_tx_name);

	free_irq(sport->irq_tx, port);

	kfree(sport->irq_tx_name);

out_r:

	kfree(sport->irq_rx_name);

	free_irq(sport->irq_rx, port);

	kfree(sport->irq_rx_name);

out_f:

	kfree(sport->irq_fault_name);

	free_irq(sport->irq_fault, port);

	kfree(sport->irq_fault_name);

out_done:

	return ret;

}
@@ -595,8 +595,11 @@ static void pic32_uart_shutdown(struct uart_port *port) 


	/* free all 3 interrupts for this UART */

	free_irq(sport->irq_fault, port);

	kfree(sport->irq_fault_name);

	free_irq(sport->irq_tx, port);

	kfree(sport->irq_tx_name);

	free_irq(sport->irq_rx, port);

	kfree(sport->irq_rx_name);

}



/* serial core request to change current uart setting */