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

Commit a3eb7fbb authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Linus Torvalds
Browse files

drivers/message/i2o/i2o_config.c: fix deadlock in compat_ioctl(I2OGETIOPS) 



i2o_cfg_compat_ioctl(I2OGETIOPS) locks i2o_cfg_mutex and then calls
i2o_cfg_ioctl(I2OGETIOPS) that locks i2o_cfg_mutex as well.  A deadlock
is guaranteed.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3cf8ca1c

drivers/message/i2o/i2o_config.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -754,19 +754,19 @@ static long i2o_cfg_compat_ioctl(struct file *file, unsigned cmd, 
				 unsigned long arg)

				 unsigned long arg)

{

{

	int ret;

	int ret;

	mutex_lock(&i2o_cfg_mutex);

	switch (cmd) {

	switch (cmd) {

	case I2OGETIOPS:

	case I2OGETIOPS:

		ret = i2o_cfg_ioctl(file, cmd, arg);

		ret = i2o_cfg_ioctl(file, cmd, arg);

		break;

		break;

	case I2OPASSTHRU32:

	case I2OPASSTHRU32:

		mutex_lock(&i2o_cfg_mutex);

		ret = i2o_cfg_passthru32(file, cmd, arg);

		ret = i2o_cfg_passthru32(file, cmd, arg);

		mutex_unlock(&i2o_cfg_mutex);

		break;

		break;

	default:

	default:

		ret = -ENOIOCTLCMD;

		ret = -ENOIOCTLCMD;

		break;

		break;

	}

	}

	mutex_unlock(&i2o_cfg_mutex);

	return ret;

	return ret;

}

}