From patchwork Sun Oct 25 10:07:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jackm X-Patchwork-Id: 535551 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8282B141307 for ; Sun, 25 Oct 2015 21:07:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=dev_mellanox_co_il.20150623.gappssmtp.com header.i=@dev_mellanox_co_il.20150623.gappssmtp.com header.b=CDHYzrmv; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751450AbbJYKHL (ORCPT ); Sun, 25 Oct 2015 06:07:11 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:32993 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751251AbbJYKHJ (ORCPT ); Sun, 25 Oct 2015 06:07:09 -0400 Received: by wijp11 with SMTP id p11so128521943wij.0 for ; Sun, 25 Oct 2015 03:07:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dev_mellanox_co_il.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references :organization:mime-version:content-type:content-transfer-encoding; bh=0zGhvRPrFkaO4UOrg6Ws2xsjg7C3AzBV+Zm9iNU60xk=; b=CDHYzrmvi3hRLTwX9zcEyAgcnzWkSk6AxRkPk4QLgqdiMPlzpZjAGX1qrsKytS+L7z XKiym5iQz8jIBRJ7zLRYH45frdkwZKFucyfzfibEF2SRbtJPNI/x3a8VRj/wshPScMFW yXQ3Tcc+40WQC70sGXSSCU+b4efiNsdbIaSEbEk1UddY096ybW0lN7L9ZjwJTtbboIY2 EpwR1FL1FhC0tPRySRnt9zOvgsd3LRk1cbr8mvgOIychQS2FW/V/GLhsf6MOuRlDKMQC KEI34IWqC3G/BH3s+5Y9nXa5j5or+yb9DZzRuMhM0KsNv6rhAoJV/Hw0NGNxpzjJNwVg 7bDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:organization:mime-version:content-type :content-transfer-encoding; bh=0zGhvRPrFkaO4UOrg6Ws2xsjg7C3AzBV+Zm9iNU60xk=; b=lpXv5GD8fZqXtEBK7S/XzeSN7ZS5VFZZrsnHyVCFnrdPdv2AN82O888+X5Di1cuzDJ m8U0EzgqjRyzfXRDxG5L17hAtZD9haZJJWFj8oGZ9Px+i5hFWfAk8beXuFrthi+WwSMh unqnD7Xc5f3iXH9pdZYHNRoEnARCj0fNQHyovp1hOjRqtOQk3v1o+RHFG4zKplvhgvSj Ic19T5hG7kW6H0tHJj3BF/+fngwtHzEJh7D4SvdU0949X4/fqM2MWi7RBmIaUlpCybY/ cPR4LxnIDFFV2OrE86Sq1lyMfNNEcLTv2ZF0hMhl7D0R6ANAOaqJZXSgrtL/LG/T9q5i vBIA== X-Gm-Message-State: ALoCoQkbmlrKG64f0HfQZQQ1R1O5Y4ugrNTDxXXTxw09X/zp6KOeOKACgLuj7M8gHbpyQHge5+lC X-Received: by 10.28.19.65 with SMTP id 62mr1470545wmt.6.1445767628322; Sun, 25 Oct 2015 03:07:08 -0700 (PDT) Received: from jpm-OptiPlex-GX620 ([193.47.165.251]) by smtp.gmail.com with ESMTPSA id q11sm10249160wik.1.2015.10.25.03.07.06 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 25 Oct 2015 03:07:07 -0700 (PDT) Date: Sun, 25 Oct 2015 12:07:43 +0200 From: Jack Morgenstein To: Or Gerlitz Cc: Carol L Soto , David Miller , Linux Netdev List , Or Gerlitz , brking@linux.vnet.ibm.com, Yevgeny Petrilin , Yishai Hadas Subject: Re: [PATCH] net/mlx4: Memcpy at slave_event should copy sizeof mlx4_eqe Message-ID: <20151025120743.3763b796@jpm-OptiPlex-GX620> In-Reply-To: References: <1445609940-12234-1-git-send-email-clsoto@linux.vnet.ibm.com> Organization: Mellanox X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.17; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Carol, Good catch! Need to add an additional chunk to your fix -- see below. On Sun, 25 Oct 2015 10:26:07 +0200 Or Gerlitz wrote: > > > --- > > drivers/net/ethernet/mellanox/mlx4/eq.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c > > b/drivers/net/ethernet/mellanox/mlx4/eq.c index c344884..603d1c3 > > 100644 --- a/drivers/net/ethernet/mellanox/mlx4/eq.c > > +++ b/drivers/net/ethernet/mellanox/mlx4/eq.c > > @@ -196,7 +196,7 @@ static void slave_event(struct mlx4_dev *dev, > > u8 slave, struct mlx4_eqe *eqe) return; > > } > > > > - memcpy(s_eqe, eqe, dev->caps.eqe_size - 1); > > + memcpy(s_eqe, eqe, sizeof(struct mlx4_eqe) - 1); > > s_eqe->slave_id = slave; > > /* ensure all information is written before setting the > > ownersip bit */ dma_wmb(); > > -- > > 1.8.3.1 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe netdev" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index 0a32020..2177e56 100644 --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c @@ -2398,7 +2398,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev) } } - memset(&priv->mfunc.master.cmd_eqe, 0, dev->caps.eqe_size); + memset(&priv->mfunc.master.cmd_eqe, 0, sizeof(struct mlx4_eqe)); priv->mfunc.master.cmd_eqe.type = MLX4_EVENT_TYPE_CMD; INIT_WORK(&priv->mfunc.master.comm_work, mlx4_master_comm_channel);