From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B282B1D0B8D; Wed, 2 Oct 2024 14:48:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727880530; cv=none; b=mAlf8PfuPWz3GznaOG3PVu0dlDcGI0n7wh11jOMkh3y9gl+VnZIPBWayg2xW3qietFsGS1yladyTfJRK85UD/bb1a1nTvL1ltiN6GYP4ZIx+PiZl/MO4BWUdOXnJCNdyKs6aO3CKr2gscoLLg8f4Z91YNuolW3XugTdV4/TGzDw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727880530; c=relaxed/simple; bh=7Y9yub6KFmRjkv4IcUgltx5QSTd10FPmTl7gRVmg4mQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eVcFD9Gyfp3Ba2aExrTelLddKyDZeVVo0U3+35dPjLXUe9FJkBqQUDdw74qHLdhPldfag4odin1/uutmGs59c1l0qi5O1rlfhuGHWNPpHUsoDYT5y/cneKijQr/VQ5VC26OatmxtaeDopitlbSxFfI6OQlpqc5jl6jYycWZmqIc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=03InCylO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="03InCylO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CECF3C4CEC2; Wed, 2 Oct 2024 14:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727880530; bh=7Y9yub6KFmRjkv4IcUgltx5QSTd10FPmTl7gRVmg4mQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=03InCylObbB6JrcmuE7XIl6RmiA+mtxEOzTFIPwl/Fvcq6HUoAzKdGKtNJPADVQ1Q qsjNxMhouOsc8M32ZmK/W3K/0K1sngXWGfNpO5AQQzTgzkP7j75Yy781ZP+dgJiNCd OAWb9j/7fb779xRUX6R3WlnMutwMuVIPFVxjZ1I4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ma Ke , Rodolfo Giometti , Sasha Levin Subject: [PATCH 6.6 490/538] pps: add an error check in parport_attach Date: Wed, 2 Oct 2024 15:02:09 +0200 Message-ID: <20241002125811.782561451@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125751.964700919@linuxfoundation.org> References: <20241002125751.964700919@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ma Ke [ Upstream commit 62c5a01a5711c8e4be8ae7b6f0db663094615d48 ] In parport_attach, the return value of ida_alloc is unchecked, witch leads to the use of an invalid index value. To address this issue, index should be checked. When the index value is abnormal, the device should be freed. Found by code review, compile tested only. Cc: stable@vger.kernel.org Fixes: fb56d97df70e ("pps: client: use new parport device model") Signed-off-by: Ma Ke Acked-by: Rodolfo Giometti Link: https://lore.kernel.org/r/20240828131814.3034338-1-make24@iscas.ac.cn Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/pps/clients/pps_parport.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/pps/clients/pps_parport.c b/drivers/pps/clients/pps_parport.c index af972cdc04b53..53e9c304ae0a7 100644 --- a/drivers/pps/clients/pps_parport.c +++ b/drivers/pps/clients/pps_parport.c @@ -149,6 +149,9 @@ static void parport_attach(struct parport *port) } index = ida_alloc(&pps_client_index, GFP_KERNEL); + if (index < 0) + goto err_free_device; + memset(&pps_client_cb, 0, sizeof(pps_client_cb)); pps_client_cb.private = device; pps_client_cb.irq_func = parport_irq; @@ -159,7 +162,7 @@ static void parport_attach(struct parport *port) index); if (!device->pardev) { pr_err("couldn't register with %s\n", port->name); - goto err_free; + goto err_free_ida; } if (parport_claim_or_block(device->pardev) < 0) { @@ -187,8 +190,9 @@ static void parport_attach(struct parport *port) parport_release(device->pardev); err_unregister_dev: parport_unregister_device(device->pardev); -err_free: +err_free_ida: ida_free(&pps_client_index, index); +err_free_device: kfree(device); } -- 2.43.0