Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1666881
| 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 | 2017-06-15 18:40 +0200 |
| Message-ID | <tSFYo-4Nd-83@gated-at.bofh.it> (permalink) |
| References | <tSFYl-4Nd-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll 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