Skip to content

Commit 5d7753d

Browse files
author
Hangbin Liu
committed
ptp: Ensure info->enable callback is always set
JIRA: https://issues.redhat.com/browse/RHEL-85028 Upstream Status: net.git commit fd53aa4 CVE: CVE-2025-21814 commit fd53aa4 Author: Thomas Weißschuh <linux@weissschuh.net> Date: Thu Jan 23 08:22:40 2025 +0100 ptp: Ensure info->enable callback is always set The ioctl and sysfs handlers unconditionally call the ->enable callback. Not all drivers implement that callback, leading to NULL dereferences. Example of affected drivers: ptp_s390.c, ptp_vclock.c and ptp_mock.c. Instead use a dummy callback if no better was specified by the driver. Fixes: d94ba80 ("ptp: Added a brand new class driver for ptp clocks.") Cc: stable@vger.kernel.org Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Acked-by: Richard Cochran <richardcochran@gmail.com> Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> Link: https://patch.msgid.link/20250123-ptp-enable-v1-1-b015834d3a47@weissschuh.net Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Hangbin Liu <haliu@redhat.com>
1 parent 93b4041 commit 5d7753d

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/ptp/ptp_clock.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,11 @@ static int ptp_getcycles64(struct ptp_clock_info *info, struct timespec64 *ts)
192192
return info->gettime64(info, ts);
193193
}
194194

195+
static int ptp_enable(struct ptp_clock_info *ptp, struct ptp_clock_request *request, int on)
196+
{
197+
return -EOPNOTSUPP;
198+
}
199+
195200
static void ptp_aux_kworker(struct kthread_work *work)
196201
{
197202
struct ptp_clock *ptp = container_of(work, struct ptp_clock,
@@ -254,6 +259,9 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
254259
ptp->info->getcrosscycles = ptp->info->getcrosststamp;
255260
}
256261

262+
if (!ptp->info->enable)
263+
ptp->info->enable = ptp_enable;
264+
257265
if (ptp->info->do_aux_work) {
258266
kthread_init_delayed_work(&ptp->aux_work, ptp_aux_kworker);
259267
ptp->kworker = kthread_create_worker(0, "ptp%d", ptp->index);

0 commit comments

Comments
 (0)