[PATCH v11 11/19] media: venus: hfi_cmds: fix variable dereferenced before check

Path	csiph.com!goblin2!goblin.stu.neva.ru!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From	Stanimir Varbanov <stanimir.varbanov@linaro.org>
Newsgroups	linux.kernel
Subject	[PATCH v11 11/19] media: venus: hfi_cmds: fix variable dereferenced before check
Date	Thu, 15 Jun 2017 18:40:04 +0200
Message-ID	<tSFYo-4Nd-83@gated-at.bofh.it> (permalink)
References	<tSFYl-4Nd-5@gated-at.bofh.it>
X-Original-To	Mauro Carvalho Chehab <mchehab@kernel.org>, Hans Verkuil <hverkuil@xs4all.nl>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PTyoPZBrq6iZva4zHnyG6otP9L/TlXnfZ3rg7uBAhNU=; b=PUG8rTleYiRzdBG/zdN8ggQpRVuY2AV/B6Sq/v6INpqobwzlWe7eo7ToVF2/1SuZSY 6IOmYz9mMjxDSmJc+lzb+Ns6BgfI7SNKIn5w80SD2GaGWynVYgP0v6alhOTJfxLGgXQy 04he9GYWBuKRF1Dko+tnhzfzWeOAgT/uc6z8U=
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PTyoPZBrq6iZva4zHnyG6otP9L/TlXnfZ3rg7uBAhNU=; b=AGX38mmcezzMI6COpvfAC9Sw9Ej7L5/cmwNvYKLr+wc58YhOXcZOrbGixkZLMPZdEI RiSRaCZo7YFiASw6oAWtMYdC7bP5SzYOMNweQOZ46iiIENPs9HooS4T/cetBigXJc4zN aaLnYyufIVlHjspaFsVtRqXPI8A5OU1jbXmHka2ulUGMMKAeL0dNvJMZ+94bA33SVb2Z Limznu24z8M1/X8PgX5owP6H3LiNPrBJ9MlLPa9CfWyBs/sUkjFgSiGxwaipgbw3O2QU YFb+yriCHembNSbWxafcwzo87WtnOUNWl/lO7Tgh2gAz2ARQYdrmP7eyg91Pxn/4US+1 oF8Q==
X-Gm-Message-State	AKS2vOzHjOPSXjthOq7/eBu1M8k6Fb0AnlM/yEust4ufD03PfqvnD8q/ MFbzl3I6X6GaW0Ac
X-Received	by 10.223.182.172 with SMTP id j44mr3062810wre.122.1497544388635; Thu, 15 Jun 2017 09:33:08 -0700 (PDT)
X-Mailer	git-send-email 2.7.4
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	52
Organization	linux.* mail to news gateway
X-Original-Cc	linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Stanimir Varbanov <stanimir.varbanov@linaro.org>
X-Original-Date	Thu, 15 Jun 2017 19:31:52 +0300
X-Original-Message-ID	<1497544320-2269-12-git-send-email-stanimir.varbanov@linaro.org>
X-Original-References	<1497544320-2269-1-git-send-email-stanimir.varbanov@linaro.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1666881

Show key headers only | View raw

This fixes a warning found when building the driver with gcc7:

drivers/media/platform/qcom/venus/hfi_cmds.c:415
pkt_session_set_property_1x() warn: variable dereferenced before
check 'pkt' (see line 412)
drivers/media/platform/qcom/venus/hfi_cmds.c:1177
pkt_session_set_property_3xx() warn: variable dereferenced before
check 'pkt' (see line 1174)

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
---
 drivers/media/platform/qcom/venus/hfi_cmds.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c
index dad41a6af42e..b83c5b8ddccb 100644
--- a/drivers/media/platform/qcom/venus/hfi_cmds.c
+++ b/drivers/media/platform/qcom/venus/hfi_cmds.c
@@ -409,12 +409,14 @@ static int pkt_session_get_property_1x(struct hfi_session_get_property_pkt *pkt,
 static int pkt_session_set_property_1x(struct hfi_session_set_property_pkt *pkt,
 				       void *cookie, u32 ptype, void *pdata)
 {
-	void *prop_data = &pkt->data[1];
+	void *prop_data;
 	int ret = 0;
 
 	if (!pkt || !cookie || !pdata)
 		return -EINVAL;
 
+	prop_data = &pkt->data[1];
+
 	pkt->shdr.hdr.size = sizeof(*pkt);
 	pkt->shdr.hdr.pkt_type = HFI_CMD_SESSION_SET_PROPERTY;
 	pkt->shdr.session_id = hash32_ptr(cookie);
@@ -1171,12 +1173,14 @@ static int
 pkt_session_set_property_3xx(struct hfi_session_set_property_pkt *pkt,
 			     void *cookie, u32 ptype, void *pdata)
 {
-	void *prop_data = &pkt->data[1];
+	void *prop_data;
 	int ret = 0;
 
 	if (!pkt || !cookie || !pdata)
 		return -EINVAL;
 
+	prop_data = &pkt->data[1];
+
 	pkt->shdr.hdr.size = sizeof(*pkt);
 	pkt->shdr.hdr.pkt_type = HFI_CMD_SESSION_SET_PROPERTY;
 	pkt->shdr.session_id = hash32_ptr(cookie);
-- 
2.7.4

Thread

[PATCH v11 00/19] Qualcomm video decoder/encoder driver Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:40 +0200
  [PATCH v11 19/19] media: venus: enable building with COMPILE_TEST Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:40 +0200
  [PATCH v11 05/19] media: venus: vdec: add video decoder files Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:40 +0200
  [PATCH v11 17/19] media: venus: vdec: add support for min buffers for capture Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:40 +0200
  [PATCH v11 14/19] media: venus: hfi_msgs: fix set but not used variables Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:40 +0200
  [PATCH v11 15/19] media: venus: vdec: fix compile error in vdec_close Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:40 +0200
  [PATCH v11 09/19] media: venus: enable building of Venus video driver Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:40 +0200
  [PATCH v11 13/19] media: venus: hfi_venus: fix variable dereferenced before check Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:40 +0200
  [PATCH v11 01/19] media: v4l2-mem2mem: extend m2m APIs for more accurate buffer management Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:40 +0200
  [PATCH v11 18/19] media: venus: update firmware path with linux-firmware place Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:40 +0200
  [PATCH v11 11/19] media: venus: hfi_cmds: fix variable dereferenced before check Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:40 +0200
  [PATCH v11 02/19] doc: DT: venus: binding document for Qualcomm video driver Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-15 18:50 +0200

csiph-web