From patchwork Tue Feb 14 03:51:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 727690 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 3vMpQQ0mknz9s7M for ; Tue, 14 Feb 2017 14:52:14 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f+G97s+b"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752061AbdBNDwB (ORCPT ); Mon, 13 Feb 2017 22:52:01 -0500 Received: from mail-ot0-f195.google.com ([74.125.82.195]:32998 "EHLO mail-ot0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751324AbdBNDvM (ORCPT ); Mon, 13 Feb 2017 22:51:12 -0500 Received: by mail-ot0-f195.google.com with SMTP id f9so14812100otd.0; Mon, 13 Feb 2017 19:51:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CcTVblXBuXmH6DiwfhIjz60ohi4S2RDMOkMFun88tjk=; b=f+G97s+bNzk7Y8WAq4R9X2viPyFA85DUv9MQOfrzLoZYnbIFbc5GEt5g9XeFkIO788 R2TzcJAUuI6exRkK6SKbmOstduiDR1k+7/0ds9hkfK/HOlHhhGgEuLtDnmwg3hTM61rr 0dZGGspPobfH32JIN51akz0sP9/l7MVk6ivd2Xw78zFaLpUmu1Nc1evOTWPI4gKujOkq 8FvUeuTldMFqz1IKSKamj8Cwfn8Lme+3Qpx09Cn4QXawQIK5yMdDwAfdfgwAo61lDPAL 1wvc3zItSzl7VxFXV7xgGaRdPiFnkf2naf5FHYAWXlwQ/nOrv2EDqnll87MOOb9snnxs t/hA== 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=CcTVblXBuXmH6DiwfhIjz60ohi4S2RDMOkMFun88tjk=; b=fb5SNaAO4VXvVxkb4wetCjJ2vqWnM4JFWd/stAsnmwT5VDH2W5sZURym5zo22jaSOl 54nmqsDumL8V/98bWPEugIAriX14pvgAvLQy2Vo7+FNA1En/lZQQHf3VwpO/At/f0Ddf QRB4yxSRMd63iQshm+2sv9ilLSAsIw8sV/6ujlgR2pAE0oaK+roWtuKRAx1Hu0qP6Xh7 +eKAebi0xX2ceOdf46sDfcv+dDYf22kblJ1EElk0Mxx8/3mcb4xXDUjfydVdg0VRDsu8 s2RrmHqkbH6BkOg0IC+qXpCifJfkOTc+4+GWyDvjNBSkIlpwl0JwIvvrI2fowKRkDni/ JaYg== X-Gm-Message-State: AMke39m/D9DdTIwPf5QgIVHSeYkpQMdcFere/SXahU2c/9Y7P+GtsP47HPqJBfqTZpE17g== X-Received: by 10.99.243.21 with SMTP id l21mr30071460pgh.37.1487044271649; Mon, 13 Feb 2017 19:51:11 -0800 (PST) Received: from dtor-ws.mtv.corp.google.com ([172.22.152.34]) by smtp.gmail.com with ESMTPSA id r21sm23359180pfd.95.2017.02.13.19.51.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Feb 2017 19:51:11 -0800 (PST) From: Dmitry Torokhov To: Richard Cochran Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] ptp: use kcalloc/kmallco_array when allocating arrays Date: Mon, 13 Feb 2017 19:51:06 -0800 Message-Id: <20170214035108.19622-2-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170214035108.19622-1-dmitry.torokhov@gmail.com> References: <20170214035108.19622-1-dmitry.torokhov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org kcalloc/kmalloc_array are more semantically correct when allocating arrays of objects, and overflow-safe. Signed-off-by: Dmitry Torokhov --- drivers/ptp/ptp_sysfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c index 53d43954a974..77843790c381 100644 --- a/drivers/ptp/ptp_sysfs.c +++ b/drivers/ptp/ptp_sysfs.c @@ -269,13 +269,13 @@ static int ptp_populate_pins(struct ptp_clock *ptp) struct ptp_clock_info *info = ptp->info; int err = -ENOMEM, i, n_pins = info->n_pins; - ptp->pin_dev_attr = kzalloc(n_pins * sizeof(*ptp->pin_dev_attr), + ptp->pin_dev_attr = kcalloc(n_pins, sizeof(*ptp->pin_dev_attr), GFP_KERNEL); if (!ptp->pin_dev_attr) goto no_dev_attr; - ptp->pin_attr = kzalloc((1 + n_pins) * sizeof(struct attribute *), - GFP_KERNEL); + ptp->pin_attr = kmalloc_array(1 + n_pins, sizeof(*ptp->pin_attr), + GFP_KERNEL); if (!ptp->pin_attr) goto no_pin_attr; @@ -289,6 +289,9 @@ static int ptp_populate_pins(struct ptp_clock *ptp) ptp->pin_attr[i] = &da->attr; } + /* NULL terminator */ + ptp->pin_attr[n_pins] = NULL; + ptp->pin_attr_group.name = "pins"; ptp->pin_attr_group.attrs = ptp->pin_attr;