lkml.org 
[lkml]   [2016]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] media: v4l2-ctrls: append missing h264 profile string
Date
This appends missing "Stereo High" h264 profile string. Without
it the v4l2 compliance would crash kernel with NULL pointer
dereference at:

[ 26.882278] [<ffff000008685cbc>] std_validate+0x378/0x42c
[ 26.886967] [<ffff000008687424>] set_ctrl+0x8c/0x134
[ 26.892521] [<ffff00000868755c>] v4l2_s_ctrl+0x90/0xf4
[ 26.897555] [<ffff00000867f3b0>] v4l_s_ctrl+0x4c/0x110
[ 26.902503] [<ffff00000867db04>] __video_do_ioctl+0x240/0x2b4
[ 26.907625] [<ffff00000867d778>] video_usercopy+0x33c/0x46c
[ 26.913441] [<ffff00000867d8bc>] video_ioctl2+0x14/0x1c
[ 26.918822] [<ffff000008678878>] v4l2_ioctl+0xe0/0x110
[ 26.924032] [<ffff0000081da898>] do_vfs_ioctl+0xb4/0x764
[ 26.929238] [<ffff0000081dafcc>] SyS_ioctl+0x84/0x98
[ 26.934707] [<ffff000008082f4c>] __sys_trace_return+0x0/0x4

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
---
drivers/media/v4l2-core/v4l2-ctrls.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index f7abfad9ad23..adc2147fcff7 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -361,6 +361,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
"Scalable Baseline",
"Scalable High",
"Scalable High Intra",
+ "Stereo High",
"Multiview High",
NULL,
};
--
2.7.4
\
 
 \ /
  Last update: 2016-09-17 09:57    [W:0.033 / U:1.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site