From patchwork Tue Jun 24 19:51:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 4412961 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 952ECBEECB for ; Tue, 24 Jun 2014 19:52:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 975A82034F for ; Tue, 24 Jun 2014 19:52:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE1D62034B for ; Tue, 24 Jun 2014 19:52:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755174AbaFXTwc (ORCPT ); Tue, 24 Jun 2014 15:52:32 -0400 Received: from mail-we0-f180.google.com ([74.125.82.180]:47572 "EHLO mail-we0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755165AbaFXTwb (ORCPT ); Tue, 24 Jun 2014 15:52:31 -0400 Received: by mail-we0-f180.google.com with SMTP id x48so888240wes.25 for ; Tue, 24 Jun 2014 12:52:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Qtmk7ySgu/R1mbzHvlXk5KG/pXol6sjT4z19MtmERvQ=; b=qy9q7BhMg60yLnu8DKlyec6geokjkqviwg3/6p3TAeyE6glacfcxmmFHrSz4vePBzI GpnUhJaSfzlynHJrtClvPxbKx3IP4X4kZYJesxzcYfBufHEHkObecrOCzEnjEBmX/sbS 4g4SxGA6hF1mUZjtPQ+ROX0pZmz/yr4SBUF1QvCuSPAW8mQHHu5fufXMAItVUd3jDOEr GkKmmTInC59mLf6eGiNHcvlO2+lZytI9UOiIb7E6V0P+fvgsAWA9c9q7iPzOWKrVYOrV w3hsBG47W0tFYURH9E8JKYEvRngXSgZJ8WD6XA9OJsOkulfi6cPzwiPG+4qQ71HfGqQc PLxA== X-Received: by 10.180.210.134 with SMTP id mu6mr5135190wic.18.1403639550310; Tue, 24 Jun 2014 12:52:30 -0700 (PDT) Received: from localhost.localdomain (93-173-134-191.bb.netvision.net.il. [93.173.134.191]) by mx.google.com with ESMTPSA id wi9sm2538735wjc.23.2014.06.24.12.52.28 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 24 Jun 2014 12:52:29 -0700 (PDT) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: David Spinadel , Emmanuel Grumbach Subject: [PATCH 02/27] iwlwifi: mvm: use ksize to memset scan_command Date: Tue, 24 Jun 2014 22:51:56 +0300 Message-Id: <1403639541-4621-2-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <53A9D6CF.9040100@gmail.com> References: <53A9D6CF.9040100@gmail.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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 From: David Spinadel Use ksize to get scan command size instead of calculating it, to avoid nasty bugs. Signed-off-by: David Spinadel Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/mvm/scan.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index 4b6c7d4..df8f3eb 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c @@ -325,9 +325,7 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm, IWL_DEBUG_SCAN(mvm, "Handling mac80211 scan request\n"); mvm->scan_status = IWL_MVM_SCAN_OS; - memset(cmd, 0, sizeof(struct iwl_scan_cmd) + - mvm->fw->ucode_capa.max_probe_length + - (MAX_NUM_SCAN_CHANNELS * sizeof(struct iwl_scan_channel))); + memset(cmd, 0, ksize(cmd)); cmd->channel_count = (u8)req->n_channels; cmd->quiet_time = cpu_to_le16(IWL_ACTIVE_QUIET_TIME);