Skip to contentSkip to conversation

FAILED: patch "[PATCH] media: venus: dec: Handle the case where find_format fails" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message Oct 26, 2022

Subsystems (5)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

06a2da340f76 ("media: venus: dec: Handle the case where find_format fails") 1946117b8f13 ("media: venus: keep resolution when adjusting format")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 06a2da340f762addc5935bf851d95b14d4692db2 Mon Sep 17 00:00:00 2001
From: Bryan O'Donoghue <[email protected]>
Date: Tue, 26 Jul 2022 04:14:54 +0200
Subject: [PATCH] media: venus: dec: Handle the case where find_format fails

Debugging the decoder on msm8916 I noticed the vdec probe was crashing if the fmt pointer was NULL.

A similar fix from Colin Ian King found by Coverity was implemented for the encoder. Implement the same fix on the decoder.

Fixes 7472c1c69138 ("[media] media: venus: vdec: add video decoder files")
Cc [email protected] # v4.13+
drivers/media/platform/qcom/venus/vdec.c +2 -0
index ac0bb45d07f4..4ceaba37e2e5 100644
@@ -183,6 +183,8 @@ vdec_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f)
 		else
 			return NULL;
 		fmt = find_format(inst, pixmp->pixelformat, f->type);
+		if (!fmt)
+			return NULL;
 	}
 
 	pixmp->width = clamp(pixmp->width, frame_width_min(inst),