From patchwork Thu Apr 18 21:02:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wander Lairson Costa X-Patchwork-Id: 790397 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D038F199E82 for ; Thu, 18 Apr 2024 21:02:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713474174; cv=none; b=NM90OaijeWqONrDe/gF01nmtr5PVZdzrRHTVLJIzQf9ntRxmFYQ4ufE2HzwTyriuglV+uH2pNM9H2AVA4QHRZt0yST1vMCPqNTU9mjG7G5MVmzkQ3TCoGtt65t1an9Jl+c6Vp4AFeIVbV1CjTIyfCbXVlyK3W2xjRHc1l/95PXM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713474174; c=relaxed/simple; bh=k7cNZQtqSrlv4JeV2BTf4vB+rduDV353rBwxNmUmz4A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fRG0Fdt6J5uO8CaKlA3knTNeQUZ38C6ByuI0WgpnNPuq/a0PM49tyQrXoFrP8LSBGW8EXNUMb3RUCJ6/VOAcG6UzmTb8eop0PxU9kyXN00In0CzzcrR2eMk8XJCkYkxbdoI3DFcZPZMWUdiZqaAqnFOBkBC1nXEdK8MWmfFXKbw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=bM+JrGkk; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bM+JrGkk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713474171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KGwLf/zGdjbS5m+0XqbUt5N2AjYYBbBkI6NTUeaiDj4=; b=bM+JrGkkecXlptEiOsd8PNikRhvPuH4gKZ5gvhuJv8COVUqcuNcyPvvssvx+Z2mUxsw568 MXgv0ljwFbpH40f+kE/7qN+SfsVme2Y1tFOmUfwHumlw/8rUCYa4ftfVs1Z9PQGaMRNd0Q axpOqMpzmEh0RTJtGy7IT1HXlKv7LPU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618-tjLOU_fXNCGZ8R2giiE72Q-1; Thu, 18 Apr 2024 17:02:47 -0400 X-MC-Unique: tjLOU_fXNCGZ8R2giiE72Q-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 429D918065AA; Thu, 18 Apr 2024 21:02:47 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.22.16.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4C1140BAA2; Thu, 18 Apr 2024 21:02:44 +0000 (UTC) From: Wander Lairson Costa To: Brendan Higgins , David Gow , Rae Moar , Greg Kroah-Hartman , Shuah Khan , Maxime Ripard , Matti Vaittinen , linux-kselftest@vger.kernel.org (open list:KERNEL UNIT TESTING FRAMEWORK (KUnit)), kunit-dev@googlegroups.com (open list:KERNEL UNIT TESTING FRAMEWORK (KUnit)), linux-kernel@vger.kernel.org (open list) Cc: Wander Lairson Costa Subject: [PATCH v3 2/2] kunit: avoid memory leak on device register error Date: Thu, 18 Apr 2024 18:02:35 -0300 Message-ID: <20240418210236.194190-3-wander@redhat.com> In-Reply-To: <20240418210236.194190-1-wander@redhat.com> References: <20240418210236.194190-1-wander@redhat.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 If the device register fails, free the allocated memory before returning. Signed-off-by: Wander Lairson Costa Fixes: d03c720e03bd ("kunit: Add APIs for managing devices") --- lib/kunit/device.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/kunit/device.c b/lib/kunit/device.c index 25c81ed465fb..bc2e2032e505 100644 --- a/lib/kunit/device.c +++ b/lib/kunit/device.c @@ -119,10 +119,8 @@ static struct kunit_device *kunit_device_register_internal(struct kunit *test, kunit_dev->owner = test; err = dev_set_name(&kunit_dev->dev, "%s.%s", test->name, name); - if (err) { - kfree(kunit_dev); - return ERR_PTR(err); - } + if (err) + goto error; kunit_dev->dev.release = kunit_device_release; kunit_dev->dev.bus = &kunit_bus_type; @@ -131,7 +129,7 @@ static struct kunit_device *kunit_device_register_internal(struct kunit *test, err = device_register(&kunit_dev->dev); if (err) { put_device(&kunit_dev->dev); - return ERR_PTR(err); + goto error; } kunit_dev->dev.dma_mask = &kunit_dev->dev.coherent_dma_mask; @@ -140,6 +138,9 @@ static struct kunit_device *kunit_device_register_internal(struct kunit *test, kunit_add_action(test, device_unregister_wrapper, &kunit_dev->dev); return kunit_dev; +error: + kfree(kunit_dev); + return ERR_PTR(err); } /*