Commit e3ea1b48 authored by Yang Yingliang's avatar Yang Yingliang Committed by Dominik Brodowski
Browse files

pcmcia: cs: fix possible hung task and memory leak pccardd() 



If device_register() returns error in pccardd(), it leads two issues:

1. The socket_released has never been completed, it will block
   pcmcia_unregister_socket(), because of waiting for completion
   of socket_released.
2. The device name allocated by dev_set_name() is leaked.

Fix this two issues by calling put_device() when device_register() fails.
socket_released can be completed in pcmcia_release_socket(), the name can
be freed in kobject_cleanup().

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 2dde18cd

drivers/pcmcia/cs.c

+1 −0
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ static int pccardd(void *__skt) 
		dev_warn(&skt->dev, "PCMCIA: unable to register socket\n");

		skt->thread = NULL;

		complete(&skt->thread_done);

		put_device(&skt->dev);

		return 0;

	}

	ret = pccard_sysfs_add_socket(&skt->dev);