From patchwork Mon Jun 12 16:27:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 103656 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp77279obh; Mon, 12 Jun 2017 09:31:00 -0700 (PDT) X-Received: by 10.101.85.69 with SMTP id t5mr57895507pgr.201.1497285060383; Mon, 12 Jun 2017 09:31:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497285060; cv=none; d=google.com; s=arc-20160816; b=Shp0HpWQJZZ2jp+GspGSRNa0aWUJC57mqM2h9y/lIUbaaacPjJPgC4MYrtQOussOan GWHh6s647P84kbFFE3JyO9+sle78NcvWwvXng9YWogBr88ZCILcoA8SROtiwMPCdr8am JnMT9v7T/juKXgCh29Fgj77M35P9Kfgk5PcObBCyUdNzMPnafypLMm++Uoffne5sOXck Zp8cdb/UoJ21OFzL8xHn5NcJeGEzujjPXtYYG18tSPe0nBwALEfklmgVT5GjakN08DMX haEkpp4bnvgUfrHPfC3hUTzMtuEP94ei3KFNsvaZSZ/Fx4Eszcsmg8vKZOA5bmP+zbTR t8BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=PTyoPZBrq6iZva4zHnyG6otP9L/TlXnfZ3rg7uBAhNU=; b=o6EJ0pKnpL7y+voSV5AlEtiWieXbMPWeLvS4zsK+Lv4a05ujPTTu2Wm2RzmS1QsUcc C9wjXxGHu5VHzmubsSiMF9rwvqwm52xcQDRh2EtqkDQf20Quyueac5HpSt5kXuUjD2Sm E7fqVNxisD+/8q78hEthXX7lhfcnyuvblgPPWDPDmYQE/3bjaK4W2tRVOZcBXRQi1vkc vjmPKJ/kZC2iDsfcwnUZ6ks70iIPBvLiFl6IXEc/pelb6325JHZHuZNTc0hJe7yMuwGy jVDjHFu1zuXBuAddrg+Ya9BTuYnGSwLt5i/s1v4vLdhHaPQ5qVGn9zre5J35mQemQnFn khRw== ARC-Authentication-Results: i=1; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 142si13486384pgg.72.2017.06.12.09.30.59; Mon, 12 Jun 2017 09:31:00 -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 sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932123AbdFLQaJ (ORCPT + 25 others); Mon, 12 Jun 2017 12:30:09 -0400 Received: from mail-wr0-f175.google.com ([209.85.128.175]:33218 "EHLO mail-wr0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754877AbdFLQaC (ORCPT ); Mon, 12 Jun 2017 12:30:02 -0400 Received: by mail-wr0-f175.google.com with SMTP id v104so101965608wrb.0 for ; Mon, 12 Jun 2017 09:30:02 -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:in-reply-to:references; bh=PTyoPZBrq6iZva4zHnyG6otP9L/TlXnfZ3rg7uBAhNU=; b=WOn/AlsWU+lE+w1zqRCEOiJiu/llvNiN8lFrZEriXoHGbeW48aIUsZqMYXsj1Pe6S/ LGREbEt3Ohn6EUkKBjz93LJaL7Lbm3mrT/xLQ+eQkVMKh+rF6i52ifArT5kNccQVzaFt id+FhyRFbN3DKJeKdqoimVdwg0e02yEF1uOnc= 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=VVamjroPYz0JzWQ8PyDZ4IjpeST23+ipSM9ixMYSr2RFVLpUiBjVtcLqVbze+uwNAr FcOLyD33D5HK4xA1UquqeStDLw6CcO4DlwQJepA63Nhs+wlNvbNphwXlWQcMg3TQJZuo kmeRXTBEIFJflslsXlDL0GOXxyCMsTxAH871XDm/fcKVycd30ubVx+edE/qCxevEYyan eDIkSAIgi7R4JrNRPH9F/T4/CJt2M2GD9bSUwZKeUAH/P+JyLK2PhpcptF2x277dYP3w rNg7Ipc48jRPo8GT8YJaYrp4Cx1nfpVr6S4vtZmW68ezISIX8JCU/ijrKBa7lu+B/NjG VXyg== X-Gm-Message-State: AODbwcDVVsH/8tONFwxCd84y+J/hNmrLQvNGTmyXN8yXkndvLqWfS3+l bKVuN4lyAsaL/V66 X-Received: by 10.223.138.194 with SMTP id z2mr8825821wrz.66.1497284989673; Mon, 12 Jun 2017 09:29:49 -0700 (PDT) Received: from mms-0440.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id 49sm14493531wrz.8.2017.06.12.09.29.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Jun 2017 09:29:49 -0700 (PDT) From: Stanimir Varbanov To: Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Stanimir Varbanov Subject: [PATCH v10 11/18] media: venus: hfi_cmds: fix variable dereferenced before check Date: Mon, 12 Jun 2017 19:27:48 +0300 Message-Id: <1497284875-19999-12-git-send-email-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497284875-19999-1-git-send-email-stanimir.varbanov@linaro.org> References: <1497284875-19999-1-git-send-email-stanimir.varbanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/media/platform/qcom/venus/hfi_cmds.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.7.4 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);