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

Commit d312a25d authored by YueHaibing's avatar YueHaibing Committed by Richard Weinberger
Browse files

um: NULL check before kfree is not needed 



kfree(NULL) is safe,so this removes NULL check before freeing the mem

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 369cca26

arch/um/drivers/vector_kern.c

+5 −10
Original line number Diff line number Diff line
@@ -1118,15 +1118,10 @@ static int vector_net_close(struct net_device *dev) 
		os_close_file(vp->fds->tx_fd);

		vp->fds->tx_fd = -1;

	}

	if (vp->bpf != NULL)

	kfree(vp->bpf);

	if (vp->fds->remote_addr != NULL)

	kfree(vp->fds->remote_addr);

	if (vp->transport_data != NULL)

	kfree(vp->transport_data);

	if (vp->header_rxbuffer != NULL)

	kfree(vp->header_rxbuffer);

	if (vp->header_txbuffer != NULL)

	kfree(vp->header_txbuffer);

	if (vp->rx_queue != NULL)

		destroy_queue(vp->rx_queue);

arch/um/drivers/vector_user.c

+2 −4
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ static struct vector_fds *user_init_raw_fds(struct arglist *ifspec) 
		os_close_file(rxfd);

	if (txfd >= 0)

		os_close_file(txfd);

	if (result != NULL)

	kfree(result);

	return NULL;

}
@@ -434,7 +433,6 @@ static struct vector_fds *user_init_socket_fds(struct arglist *ifspec, int id) 
	if (fd >= 0)

		os_close_file(fd);

	if (result != NULL) {

		if (result->remote_addr != NULL)

		kfree(result->remote_addr);

		kfree(result);

	}

arch/um/kernel/irq.c

+1 −2
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ static void garbage_collect_irq_entries(void) 
			to_free = NULL;

		}

		walk = walk->next;

		if (to_free != NULL)

		kfree(to_free);

	}

}