stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <gregkh@linuxfoundation.org>
To: dan.carpenter@oracle.com, gregkh@linuxfoundation.org,
	laurent.pinchart@ideasonboard.com, mchehab@s-opensource.com
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "[media] staging: media: davinci_vpfe: unlock on error in vpfe_reqbufs()" has been added to the 4.9-stable tree
Date: Mon, 09 Jan 2017 16:27:53 +0100	[thread overview]
Message-ID: <14839756732815@kroah.com> (raw)


This is a note to let you know that I've just added the patch titled

    [media] staging: media: davinci_vpfe: unlock on error in vpfe_reqbufs()

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     staging-media-davinci_vpfe-unlock-on-error-in-vpfe_reqbufs.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From c4a407b91f4b644145492e28723f9f880efb1da0 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 18 Nov 2016 09:30:24 -0200
Subject: [media] staging: media: davinci_vpfe: unlock on error in vpfe_reqbufs()

From: Dan Carpenter <dan.carpenter@oracle.com>

commit c4a407b91f4b644145492e28723f9f880efb1da0 upstream.

We should unlock before returning this error code in vpfe_reqbufs().

Fixes: 622897da67b3 ("[media] davinci: vpfe: add v4l2 video driver support")

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/staging/media/davinci_vpfe/vpfe_video.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -1362,7 +1362,7 @@ static int vpfe_reqbufs(struct file *fil
 	ret = vb2_queue_init(q);
 	if (ret) {
 		v4l2_err(&vpfe_dev->v4l2_dev, "vb2_queue_init() failed\n");
-		return ret;
+		goto unlock_out;
 	}
 
 	fh->io_allowed = 1;


Patches currently in stable-queue which might be from dan.carpenter@oracle.com are

queue-4.9/staging-media-davinci_vpfe-unlock-on-error-in-vpfe_reqbufs.patch
queue-4.9/mmc-mmc_test-uninitialized-return-value.patch
queue-4.9/relay-check-array-offset-before-using-it.patch
queue-4.9/target-iscsi-fix-double-free-in-lio_target_tiqn_addtpg.patch
queue-4.9/s390-crypto-unlock-on-error-in-prng_tdes_read.patch
queue-4.9/usb-xhci-mem-use-passed-in-gfp-flags-instead-of-gfp_kernel.patch
queue-4.9/iommu-amd-missing-error-code-in-amd_iommu_init_device.patch
queue-4.9/efi-efivar_ssdt_load-don-t-return-success-on-allocation-failure.patch
queue-4.9/asoc-intel-skylake-fix-a-shift-wrapping-bug.patch
queue-4.9/input-synaptics-rmi4-unlock-on-error.patch

                 reply	other threads:[~2017-01-09 15:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=14839756732815@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=dan.carpenter@oracle.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=mchehab@s-opensource.com \
    --cc=stable-commits@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).