From patchwork Mon Jun 8 11:23:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 6564221 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2A3D1C0020 for ; Mon, 8 Jun 2015 11:23:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE5B22047C for ; Mon, 8 Jun 2015 11:23:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 41F232045E for ; Mon, 8 Jun 2015 11:23:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752745AbbFHLXg (ORCPT ); Mon, 8 Jun 2015 07:23:36 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:36409 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752613AbbFHLXe (ORCPT ); Mon, 8 Jun 2015 07:23:34 -0400 Received: by wgbgq6 with SMTP id gq6so100695033wgb.3 for ; Mon, 08 Jun 2015 04:23:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=lz0zAWIhxFcPYtD52C5Hkq2atZGh7RxAAxHd/L1QbJ8=; b=oD4NPFXiABF4htW1x8VpqIlDjsbxubgUOyhCQzrZ4vPyVK2KpSnoJ9TguPiJFB5pMu HIHVnzFGFCJpVD1/t3uv1NuteCiGmco+KomsLpwD6SS++N6Fs9pedt0+Q8jpIWG5U+Bj V9rNqSN00R+XpczSQoqfuBuK8LyOQeEIvFBhg= 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=lz0zAWIhxFcPYtD52C5Hkq2atZGh7RxAAxHd/L1QbJ8=; b=CJh5rKpP2bIRJfn2alCU1O6i0KNdWHKlRD6wwuKXvdWjICdSBp3HDtYzF2WSD0QVjT wSYtqjZsDBv8h+/LbG/2eLCEPUxFDPbzJeCUKo8zK1NqfXcXEIFb+gawm4lCEhwaX+QK ZVkTc1m2KOL2IhSO0V5lJ/WG/uDvAMyUszHHzWT8ZgMcxEHQxb8HA8nmu6YS8lSHCpok r4q4x6Jw9q7HATwhKdPuxr8CodBVn4GAOixsqOduokiftsqwbcAzDF4BGCjY9IoTGbdy bJkwLzx4CnP+skoIeu3QaS4Ronkkm51R9fPzBWh63O/+TgEWEgXQIDJUCVrMYqfaob8Z bK6Q== X-Gm-Message-State: ALoCoQkc6svhWnuvwFupo2E8n319nprI2KDx8r3pzH32h9JX3ReJW317L5T7I0oQUq23y60LhNhTNpyh7FYqoAao8OzPP1FSGfHki6wq4BgMLtissx9+gSt84mJB2DUeoR4Xz3Fma4o/ X-Received: by 10.180.76.134 with SMTP id k6mr21148781wiw.43.1433762613570; Mon, 08 Jun 2015 04:23:33 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id 12sm3783086wjw.17.2015.06.08.04.23.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Jun 2015 04:23:32 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH] ath10k: prevent memory leak in wmi rx ops Date: Mon, 8 Jun 2015 13:23:27 +0200 Message-Id: <1433762607-28854-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Found during code review. This was pretty much impossible to happen but better safe than sorry. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 3 ++- drivers/net/wireless/ath/ath10k/wmi.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c index 563fde73623c..8fdba3865c96 100644 --- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c +++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c @@ -402,7 +402,7 @@ static void ath10k_wmi_tlv_op_rx(struct ath10k *ar, struct sk_buff *skb) id = MS(__le32_to_cpu(cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID); if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL) - return; + goto out; trace_ath10k_wmi_event(ar, id, skb->data, skb->len); @@ -521,6 +521,7 @@ static void ath10k_wmi_tlv_op_rx(struct ath10k *ar, struct sk_buff *skb) break; } +out: dev_kfree_skb(skb); } diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 77220b0f0e89..c2e86edfd66f 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -3222,7 +3222,7 @@ static void ath10k_wmi_op_rx(struct ath10k *ar, struct sk_buff *skb) id = MS(__le32_to_cpu(cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID); if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL) - return; + goto out; trace_ath10k_wmi_event(ar, id, skb->data, skb->len); @@ -3326,6 +3326,7 @@ static void ath10k_wmi_op_rx(struct ath10k *ar, struct sk_buff *skb) break; } +out: dev_kfree_skb(skb); } @@ -3339,7 +3340,7 @@ static void ath10k_wmi_10_1_op_rx(struct ath10k *ar, struct sk_buff *skb) id = MS(__le32_to_cpu(cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID); if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL) - return; + goto out; trace_ath10k_wmi_event(ar, id, skb->data, skb->len); @@ -3462,7 +3463,7 @@ static void ath10k_wmi_10_2_op_rx(struct ath10k *ar, struct sk_buff *skb) id = MS(__le32_to_cpu(cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID); if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL) - return; + goto out; trace_ath10k_wmi_event(ar, id, skb->data, skb->len); @@ -3570,6 +3571,7 @@ static void ath10k_wmi_10_2_op_rx(struct ath10k *ar, struct sk_buff *skb) break; } +out: dev_kfree_skb(skb); }