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: 73961 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1885699qga; Tue, 16 Aug 2016 02:10:04 -0700 (PDT) X-Received: by 10.66.216.130 with SMTP id oq2mr8612076pac.89.1471338604410; Tue, 16 Aug 2016 02:10:04 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h16si31272830pfj.245.2016.08.16.02.10.04; Tue, 16 Aug 2016 02:10:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753269AbcHPJKC (ORCPT + 27 others); Tue, 16 Aug 2016 05:10:02 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:37141 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751226AbcHPJKA (ORCPT ); Tue, 16 Aug 2016 05:10:00 -0400 Received: by mail-wm0-f51.google.com with SMTP id i5so153124383wmg.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=Nuf2l7k2elLnqHHE6uZT+Xmh+aJWb1KIM/gGNtwis8WnV1xN67mG2rAPu7zAP1TqNs EI2Was9pXHbHVcAI0uokxjUwWFgxsfQ5vjXU4SLeZ0NoOoH5euEzufDM66MvJyCFZfoD Hk82JiwrNkWJ9WstXGJezDWBZxDDcFzepVKS5izT5Jd2nIy9Q+g2Ms6ulaeRF5DbZZtB IGHrGVz3JKPLgF9F1vtfmIj0WHoH214h3U0c3WWZSAalYTH/rRbwvsVw0Y0JjjwoYj/c Peo8ibVEpuIrN3MSNLiZWXLt3XZzl8jAMw9bzfoYjildMlflOZ1FBcJ+OeqUFrqUh6oI TnxA== X-Gm-Message-State: AEkoout8VMQxcv423Q/m4xDQLK8XywVUPVYVJMes8Cn3fB5dg03+CUCmgxVdSJqvFiqwzpXL 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/media/v4l2-core/v4l2-ctrls.c | 1 + 1 file changed, 1 insertion(+) -- 2.7.4 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, };