Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp979031iog; Thu, 30 Jun 2022 14:18:01 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tJt4aRiFHkCnUbpA/tKJb1iPnbxdW5V3b0WH57N0LvGS87qOo2cMMrKp9PjaYn7A5Op6zb X-Received: by 2002:a17:907:94ce:b0:726:449e:73cc with SMTP id dn14-20020a17090794ce00b00726449e73ccmr10959256ejc.270.1656623880827; Thu, 30 Jun 2022 14:18:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656623880; cv=none; d=google.com; s=arc-20160816; b=HY5KsyBTMXrIwZg2bUzdSnEK7UJ3BtjCPZ3VsqTEiKEW0SjWCcshrPUzoC1+kVi0C7 bUYLq/vh3WFOOAs+yiqsZIYVxtLx/MbIb6STm26M5JCqgfxVb6PyKnNcXUZx/I1kOXYc Pq33o9FT3Ov7EUN0wyD7pN5+bKFDTG2NDqRZkpxLAmrDX2MmTLlB6OxkHmJNsEvAAZbE He2t1I23FNPmoJEdIkfITl5Wl5LRjOKqBWt4iSMOOm0SKFAG32vJJfMWfkKdTUNBC3ev wxp9iQ9HAwUBkYg8j7z4MK+dzsDaAQPfRq1+gE0satGNeCj9WLYYkGaSXduKpqKnz0Us hlCQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=It3YZAgi03E18Cc6hv0xeRDNLUyEWfSjD/hm7+laFmU=; b=acxfn2woWJmm9kELoUoYLYJRUYtY3ffgkGawrhvwMsJCoUptIsiY9e8rtIml+neFAx KzyhxWpatmw9Qnw0wOzNzQ5ehR/NCITimazv2Vzy3EegDpznvHhlqA32pliiGhMaqaMi Yae0fp0d6ZU6hQeSMa1LhoFAZKBO5pIZUneDg0VUL2XjFy9idZZhPDGhQEbkpW2H88ds 5hsyNo2msl006dvGbDzZgBr5aTXQPJkkqHISy2fb6efyE6PSBPr2qxsSaGOe391g21ST YEAs4TBaoeL2XXXhd3Pe1hL5spM7YbV5rq2WXmwyHuBkiQVhXmOimLI4ArsSk3ChYtYi OFNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RykVFf4m; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d15-20020a170906c20f00b007219be3906bsi4723900ejz.578.2022.06.30.14.17.29; Thu, 30 Jun 2022 14:18:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-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=RykVFf4m; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-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 S237044AbiF3VOw (ORCPT + 99 others); Thu, 30 Jun 2022 17:14:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236786AbiF3VOv (ORCPT ); Thu, 30 Jun 2022 17:14:51 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE2CD1FCCF for ; Thu, 30 Jun 2022 14:14:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656623690; x=1688159690; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=XUIWS8InKYLfjv9sCg+brF2VZPzCPp+3MPNXux8fhN4=; b=RykVFf4mCvyYdm706oRNY4vEVhfGxZPOMGA+9ni15ueQ+aju8c9mvMoM 6ng4aWu/AqXF1//paVrqjPGUCYBaSMp/3FQ1by0fXavl59ffB+j3yD6Fk h14H3Koj4AAdUEVE5mOSh09nYjTa2oXIG4chFDy9ElfiPWA5owDfG9Jta km+cLLzlYWEoKNMcIq+qYl3AZyHGKoAeTshWDdvl2PfV5qZ3wZGZ9un5r J07fduVICrCeEI/E99GIm3OZJDIeVqIVVE72/S6LlBY7UFT+ZfVIM/9+O nGlYpHXNulg53k6Ec2oedt+gmpx6JH5dWEYtZYs8XkOUqzWCIRdFieA+p A==; X-IronPort-AV: E=McAfee;i="6400,9594,10394"; a="271242786" X-IronPort-AV: E=Sophos;i="5.92,235,1650956400"; d="scan'208";a="271242786" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2022 14:14:49 -0700 X-IronPort-AV: E=Sophos;i="5.92,235,1650956400"; d="scan'208";a="733788061" Received: from ikipnis-mobl2.amr.corp.intel.com (HELO bgi1-mobl2.amr.corp.intel.com) ([10.212.122.213]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2022 14:14:49 -0700 From: Brian Gix To: linux-bluetooth@vger.kernel.org Cc: luiz.von.dentz@gmail.com, brian.gix@intel.com Subject: [PATCH BlueZ] mesh: Fix potential memory leak Date: Thu, 30 Jun 2022 14:13:13 -0700 Message-Id: <20220630211313.210017-1-brian.gix@intel.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,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-bluetooth@vger.kernel.org This memory leak will never happen, however since we added a new return from function that malloc'd memory, the free should still be done. --- mesh/mesh-config-json.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c index 5bb1e5ce0..7f46c8582 100644 --- a/mesh/mesh-config-json.c +++ b/mesh/mesh-config-json.c @@ -1961,8 +1961,10 @@ bool mesh_config_comp_page_add(struct mesh_config *cfg, uint8_t page, len = (size * 2) + 3; buf = l_malloc(len); ret = snprintf(buf, len, "%2.2x", page); - if (ret < 0) + if (ret < 0) { + l_free(buf); return false; + } hex2str(data, size, buf + 2, len - 2); -- 2.36.1