Commit cd69bf36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mailbox-fixes-6.4-rc5' of git://git.linaro.org/landing-teams/working/fujitsu/integration 

Pull mailbox fix from Jassi Brar:
 "Fix missing mutex unlock in mailbox-test"

* tag 'mailbox-fixes-6.4-rc5' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  mailbox: mailbox-test: fix a locking issue in mbox_test_message_write()
parents f39dda98 8fe72b76

drivers/mailbox/mailbox-test.c

+6 −4
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ static ssize_t mbox_test_message_write(struct file *filp, 
				       size_t count, loff_t *ppos)

{

	struct mbox_test_device *tdev = filp->private_data;

	char *message;

	void *data;

	int ret;
@@ -113,12 +114,13 @@ static ssize_t mbox_test_message_write(struct file *filp, 
		return -EINVAL;

	}



	mutex_lock(&tdev->mutex);



	tdev->message = kzalloc(MBOX_MAX_MSG_LEN, GFP_KERNEL);

	if (!tdev->message)

	message = kzalloc(MBOX_MAX_MSG_LEN, GFP_KERNEL);

	if (!message)

		return -ENOMEM;



	mutex_lock(&tdev->mutex);



	tdev->message = message;

	ret = copy_from_user(tdev->message, userbuf, count);

	if (ret) {

		ret = -EFAULT;