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 634CF1DE3B5; Wed, 6 Nov 2024 13:03: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=1730898230; cv=none; b=MGGZsut1bUOcfcG+PMiLNJ26lzcYDNu/ZTICTFVo0daGpCnurcGZz9JCfh0NHzJC3p3ZEgtCNJOvgTJRapj/8b5ouippnDhsIItzJyJLS6RwHyYHTwWSpO/L20DffrowQhQq87eVaoiiI/MVFwLP0tGXF51o4o6aYkeQUF57oSw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730898230; c=relaxed/simple; bh=VR6wFjBKyifCY/cTwCfJzWGcxdTf5Qp09x2J78u5QEU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NdR5ioZRBuMy1BGww3B7ncyo06ugQDGS1k3f6j5L+G/H5Tyv7TLzHWLJ3QliRduVDoinpJY7WknvFvblGTTMvnUGtj6WAfI87muGtXWbKrCu0MGnbmRNxQ6MP80bZ7fUMAQ9ZMRC2OuWcLgv4k/+L4w2pF5cdjV0ncQBibFyA2c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=V732DU0q; 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="V732DU0q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8BA0C4CECD; Wed, 6 Nov 2024 13:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730898230; bh=VR6wFjBKyifCY/cTwCfJzWGcxdTf5Qp09x2J78u5QEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V732DU0qTnuV+dUf9qWsF1kgk/zO0Ft0n0TGIik1VrcBv2BDTcRTcXZ0jRuLvZcjp R/TlrBheE8O1FNk/mb1rmg+ovHY1v15uoaZQ2J0ylEm4F4k/gjGodYK9VfLhsG5IEX HtsnO6ODA6sDugtXbu9hRsbawOqh4sDKoN93JnpE= 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 5.4 168/462] pps: add an error check in parport_attach Date: Wed, 6 Nov 2024 13:01:01 +0100 Message-ID: <20241106120335.669540437@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120331.497003148@linuxfoundation.org> References: <20241106120331.497003148@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-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 4bb3678c7e451..84e49204912f8 100644 --- a/drivers/pps/clients/pps_parport.c +++ b/drivers/pps/clients/pps_parport.c @@ -145,6 +145,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; @@ -155,7 +158,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) { @@ -183,8 +186,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