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

Commit 06e1b249 authored by Alexandre Bounine's avatar Alexandre Bounine Committed by Linus Torvalds
Browse files

rapidio: fix error handling in mbox request/release functions 

Add checking for error code returned by HW-specific mbox open routines.
Ensure that resources are properly release if failed.

This patch is applicable to kernel versions starting from v2.6.15.

Link: http://lkml.kernel.org/r/1469125134-16523-9-git-send-email-alexandre.bounine@idt.com


Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com>
Cc: Barry Wood <barry.wood@idt.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f5485eb0

drivers/rapidio/rio.c

+42 −12
Original line number Diff line number Diff line
@@ -268,6 +268,12 @@ int rio_request_inb_mbox(struct rio_mport *mport, 
		mport->inb_msg[mbox].mcback = minb;



		rc = mport->ops->open_inb_mbox(mport, dev_id, mbox, entries);

		if (rc) {

			mport->inb_msg[mbox].mcback = NULL;

			mport->inb_msg[mbox].res = NULL;

			release_resource(res);

			kfree(res);

		}

	} else

		rc = -ENOMEM;
@@ -285,13 +291,22 @@ int rio_request_inb_mbox(struct rio_mport *mport, 
 */

int rio_release_inb_mbox(struct rio_mport *mport, int mbox)

{

	if (mport->ops->close_inb_mbox) {

	int rc;



	if (!mport->ops->close_inb_mbox || !mport->inb_msg[mbox].res)

		return -EINVAL;



	mport->ops->close_inb_mbox(mport, mbox);

	mport->inb_msg[mbox].mcback = NULL;



		/* Release the mailbox resource */

		return release_resource(mport->inb_msg[mbox].res);

	} else

		return -ENOSYS;

	rc = release_resource(mport->inb_msg[mbox].res);

	if (rc)

		return rc;



	kfree(mport->inb_msg[mbox].res);

	mport->inb_msg[mbox].res = NULL;



	return 0;

}



/**
@@ -336,6 +351,12 @@ int rio_request_outb_mbox(struct rio_mport *mport, 
		mport->outb_msg[mbox].mcback = moutb;



		rc = mport->ops->open_outb_mbox(mport, dev_id, mbox, entries);

		if (rc) {

			mport->outb_msg[mbox].mcback = NULL;

			mport->outb_msg[mbox].res = NULL;

			release_resource(res);

			kfree(res);

		}

	} else

		rc = -ENOMEM;
@@ -353,13 +374,22 @@ int rio_request_outb_mbox(struct rio_mport *mport, 
 */

int rio_release_outb_mbox(struct rio_mport *mport, int mbox)

{

	if (mport->ops->close_outb_mbox) {

	int rc;



	if (!mport->ops->close_outb_mbox || !mport->outb_msg[mbox].res)

		return -EINVAL;



	mport->ops->close_outb_mbox(mport, mbox);

	mport->outb_msg[mbox].mcback = NULL;



		/* Release the mailbox resource */

		return release_resource(mport->outb_msg[mbox].res);

	} else

		return -ENOSYS;

	rc = release_resource(mport->outb_msg[mbox].res);

	if (rc)

		return rc;



	kfree(mport->outb_msg[mbox].res);

	mport->outb_msg[mbox].res = NULL;



	return 0;

}



/**