From patchwork Mon Jul 24 11:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 124866 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1734869vqg; Mon, 24 Jul 2023 04:33:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlGjSFDY96u5IT0Hxz3J5i+rcrSsuFMlLvyHlP7pa1Q0C/UabqU7wZdJxvKS6M3yleLUqPjk X-Received: by 2002:a05:6870:e0ca:b0:1b5:688b:5c24 with SMTP id a10-20020a056870e0ca00b001b5688b5c24mr8677214oab.32.1690198437850; Mon, 24 Jul 2023 04:33:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690198437; cv=none; d=google.com; s=arc-20160816; b=ZX3d9EsNilopxQL2bGuaoUbBRkhlsOEKtRz/X4YbubdgfsWghtYQS7TBZavYqwAfSD 6y+2WRAGI+bwhrhdNFh5DdxkvS7ud2+QGaMSj+4QCfqzuqD+p5/EREUxl5lz0WaPP9A9 v83DcKlfY2z5Q05cUrog9U69svpTy/N3tRApHC/fvuRwMzuPDAbxYlCShO2hD4XCV3fJ 3seg/1MOHQUMUfqn+zPsLumCHhXtl9JxOi+DQnTLchnXvzyy0gWMuRr4AOqa/FQOJOrT VtwxMQ1FCTCtC4cEkx9ZGCKHb+ioVBPHolfUlcHHeFQJ47s/wyTukIY//wULjKnAyOJU j9aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KQ0ttq+qx69G014ECKg9SJrL43RLk26FYuRflvmuZP0=; fh=zI/sCjjpFZFpRWFbJrpu9GJ6xSZKd2JacIs4UkYeF5Q=; b=PWYwBU/C341LWjOmKPPOFoIlZ9NPO5TM+JVoZ4XMqi0LjbAobIPw0CQdFKpDmfR8dE MHy29L6/XGv9txRS6Y0X20GFqQlqLAuvA94LcMa8is0bhzOmxyyGsWcbJTlvGpROhOS5 ycgVuqdSYf/wvlYnkVt89XKN5oLk6EZ9NXGRfAVJCXUr69FNZtqlv8ztFsKuuCOrc2F3 eBmCwTWZLSXbagzkFK2RaYRagt85Zn6JfPN9ayUn+an11s+U7KlCHfwu/pZIGyxD4h2x r9KV6sAJwDyzR9bf4YBRl7axcPlKjtpJrHVoo3ngMrZA5Qkob59zlLelj2FqyY9z4wjo /yeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ncRQdXmn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j7-20020a63ec07000000b0054fdfd26dfesi8954430pgh.308.2023.07.24.04.33.44; Mon, 24 Jul 2023 04:33:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ncRQdXmn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233349AbjGXLCU (ORCPT + 99 others); Mon, 24 Jul 2023 07:02:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233315AbjGXLCM (ORCPT ); Mon, 24 Jul 2023 07:02:12 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5C3E19B; Mon, 24 Jul 2023 04:02:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690196528; x=1721732528; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G3EfKhulqiVD/k8ML7lvWomq7mPN98qxK02WVuePlyA=; b=ncRQdXmnjjJzc0LXweNOENf03qXfGfZL2rSYESTOY1pPDgB33wAVCv30 pbaxEntp2iTQfqZkiDhzNRa8hHZhoJVnpB8sdnATGy7tjaqLHTK1XuyVo pBV7E+11MDLOIlWXMmAfpIR3LkbRCoKFIteDNxDcMSYwR1GkULw3jnckt nl82Em75LOEGCz+MduzDWWgnGZBafNAGp34YGyWUT96CR5AS82g7/Vd7R Y3wkWt4jiiqFAf/WXfsatA3nyAX53WtoUcgmPpw1jLMPC2oTYbr9ZR6Ww vRUdUWclG0bKQS/EfklZFUoWWCEHpkiBZcYjwjZIdE349zDc4FGNkMter w==; X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="347012825" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="347012825" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2023 04:02:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="815775356" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="815775356" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 24 Jul 2023 04:01:58 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id D1E6F2E9; Mon, 24 Jul 2023 14:02:06 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Nuno Sa Subject: [PATCH v3 3/4] iio: core: Switch to krealloc_array() Date: Mon, 24 Jul 2023 14:02:03 +0300 Message-Id: <20230724110204.46285-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230724110204.46285-1-andriy.shevchenko@linux.intel.com> References: <20230724110204.46285-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772301517019108915 X-GMAIL-MSGID: 1772301517019108915 Let the krealloc_array() copy the original data and check for a multiplication overflow. Signed-off-by: Andy Shevchenko Reviewed-by: Nuno Sa --- drivers/iio/industrialio-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 118ca6b59504..13d6b6ac5ccf 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1474,7 +1474,7 @@ int iio_device_register_sysfs_group(struct iio_dev *indio_dev, const struct attribute_group **new, **old = iio_dev_opaque->groups; unsigned int cnt = iio_dev_opaque->groupcounter; - new = krealloc(old, sizeof(*new) * (cnt + 2), GFP_KERNEL); + new = krealloc_array(old, cnt + 2, sizeof(*new), GFP_KERNEL); if (!new) return -ENOMEM;