From patchwork Tue Aug 16 09:09:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 9282943 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E8F1F607FD for ; Tue, 16 Aug 2016 09:10:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D829625819 for ; Tue, 16 Aug 2016 09:10:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC98428C83; Tue, 16 Aug 2016 09:10:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 563ED25819 for ; Tue, 16 Aug 2016 09:10:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753163AbcHPJKB (ORCPT ); Tue, 16 Aug 2016 05:10:01 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:37141 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751861AbcHPJKA (ORCPT ); Tue, 16 Aug 2016 05:10:00 -0400 Received: by mail-wm0-f50.google.com with SMTP id i5so153124382wmg.0 for ; Tue, 16 Aug 2016 02:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=KKsWlcYLXXte/i3sMToJm3uBOPn8EuFMpquIjtwQ+vU=; b=ay+1zyTKjykj+JuRtw2ZvpmsLsLwXlciIUqlQB4EVdMG6gBqvQAKaj5DkNXYIJuARu IdSY7CsBuFKJOSlT9I7bgpESealjIILpHxL0h+YY7SDAFJ67pdGcrsMFB24xs6+Y+At/ bUemw2KdDsw3FDg2mYYVC+l+0jJBuhEgwumIY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KKsWlcYLXXte/i3sMToJm3uBOPn8EuFMpquIjtwQ+vU=; b=J/0EPTvlwq8oh0LsqdnvxANq/XClOHNZL+KuFDJTeCYJXlr5mheIc6ytKNO1R/9Tf6 cMpse0vDF5BoUmxBqsl98fVkXqVOeiAYd84cPkvarPGRU2NuZFPZifvK5hfa2pvPiHjY mRmgwgYj+9lqR6zR7GnVHCAxYuzoep7EIpQe0xmEz38EcsbtcBQx5GRg7On2jleDdwis 956PTnQC39PZesiF/dkEZ2+NYb1QFXltAWWP4dg6qh175gEXa3dTzBpZ1kZqGMYerC1Y YImde9qetGhlI9ooHX1vEoZY+b0WKbptJAVNPTvAiAK1ueeias5GtwXX9feq0ctpxQpb CRSg== X-Gm-Message-State: AEkooustkH7UhTLtwJpRDW6RgFytXAkzkyRs1+iCgodtUnEF6TT6+WIO/tHZN6tOb/JidhrY X-Received: by 10.194.47.206 with SMTP id f14mr40618151wjn.98.1471338598678; Tue, 16 Aug 2016 02:09:58 -0700 (PDT) Received: from mms-0440.wifi.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id ko7sm25534299wjc.48.2016.08.16.02.09.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Aug 2016 02:09:58 -0700 (PDT) From: Stanimir Varbanov To: Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Stanimir Varbanov Subject: [PATCH] media: v4l2-ctrls: append missing h264 profile string Date: Tue, 16 Aug 2016 12:09:42 +0300 Message-Id: <1471338582-1014-1-git-send-email-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This appends missing "Stereo High" h264 profile string. Without it the v4l2 compliance would crash kernel with NULL pointer dereference at: [ 26.882278] [] std_validate+0x378/0x42c [ 26.886967] [] set_ctrl+0x8c/0x134 [ 26.892521] [] v4l2_s_ctrl+0x90/0xf4 [ 26.897555] [] v4l_s_ctrl+0x4c/0x110 [ 26.902503] [] __video_do_ioctl+0x240/0x2b4 [ 26.907625] [] video_usercopy+0x33c/0x46c [ 26.913441] [] video_ioctl2+0x14/0x1c [ 26.918822] [] v4l2_ioctl+0xe0/0x110 [ 26.924032] [] do_vfs_ioctl+0xb4/0x764 [ 26.929238] [] SyS_ioctl+0x84/0x98 [ 26.934707] [] __sys_trace_return+0x0/0x4 Signed-off-by: Stanimir Varbanov Acked-by: Sakari Ailus --- 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, };