From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [91.218.175.172]) (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 5B43A1E487 for ; Sat, 21 Jun 2025 20:29:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750537762; cv=none; b=SUogbZpRh2rB7z4mizx2Fj6c4bCcGRW8a/EG9YfJbyLzKfcDULtgnL3KXkqdJjIFUIcAhplh6Q2644p/JvGf0IWr1ah1ms2ggZoA9+0nxToOG6dqXbBc/qdVrOt4Z1rTxcwsn0jazr6K9YvUzMM+RHyWIiZK/qcSq7BmUo52Rss= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750537762; c=relaxed/simple; bh=v84buPkTLagC4U7I9fNCwiojqNOCA5dl5didfcPqH+Y=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=IPyGmFvN/zVUD1aN4w2sVJjEItnRlFDKoj4RldjGPEcPnQ4QssyKQHW1W5TlXKO4YfSIp9l70lxervgZHRSK/NrCvYjTDzzglGT6zXII/xS7cud2wFUB8MXFPSTKgijEe/Y3VCBtjSZkMGv9SheQGBwH6KdxQu1huko//HjQHuU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=aQs9pLwT; arc=none smtp.client-ip=91.218.175.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="aQs9pLwT" Message-ID: <74a41565-1778-4e68-bc2c-32ae6956343a@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1750537746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zd37vjlTdg+X/jv1wd6e/fvzj2B3M30ssdbW95aFJkg=; b=aQs9pLwT9+mU/cNEgQpaUDkZoPS0rITRDnecsrStdDiNThLQbXApZdtGFsEOYYINg1OjtT qGlsYd4q7XFjTT7/fQgRiFtsb3L2RRBSgKm4syo9CqhvrSQhmbA2CJ38Mx5mfIFC1Y+EJy MrR+YjwcFpZbsFSY2MCvqgjNzCl4FrM= Date: Sat, 21 Jun 2025 21:29:05 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [patch 06/13] ptp: Split out PTP_SYS_OFFSET_EXTENDED ioctl code To: Thomas Gleixner , LKML Cc: Richard Cochran , netdev@vger.kernel.org References: <20250620130144.351492917@linutronix.de> <20250620131944.092766931@linutronix.de> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Vadim Fedorenko In-Reply-To: <20250620131944.092766931@linutronix.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT On 20/06/2025 14:24, Thomas Gleixner wrote: > Continue the ptp_ioctl() cleanup by splitting out the > PTP_SYS_OFFSET_EXTENDED ioctl code into a helper function. > > Convert it to __free() to avoid gotos. > > No functional change intended. > > Signed-off-by: Thomas Gleixner > --- > drivers/ptp/ptp_chardev.c | 75 +++++++++++++++++++++++----------------------- > 1 file changed, 39 insertions(+), 36 deletions(-) > > --- a/drivers/ptp/ptp_chardev.c > +++ b/drivers/ptp/ptp_chardev.c > @@ -319,16 +319,52 @@ static long ptp_sys_offset_precise(struc > return copy_to_user(arg, &precise_offset, sizeof(precise_offset)) ? -EFAULT : 0; > } > > +static long ptp_sys_offset_extended(struct ptp_clock *ptp, void __user *arg) > +{ > + struct ptp_sys_offset_extended *extoff __free(kfree) = NULL; > + struct ptp_system_timestamp sts; > + > + if (!ptp->info->gettimex64) > + return -EOPNOTSUPP; > + > + extoff = memdup_user(arg, sizeof(*extoff)); > + if (IS_ERR(extoff)) > + return PTR_ERR(extoff); > + > + if (extoff->n_samples > PTP_MAX_SAMPLES || > + extoff->rsv[0] || extoff->rsv[1] || > + (extoff->clockid != CLOCK_REALTIME && > + extoff->clockid != CLOCK_MONOTONIC && > + extoff->clockid != CLOCK_MONOTONIC_RAW)) > + return -EINVAL; > + > + sts.clockid = extoff->clockid; > + for (unsigned int i = 0; i < extoff->n_samples; i++) { > + struct timespec64 ts; > + int err; > + > + err = ptp->info->gettimex64(ptp->info, &ts, &sts); > + if (err) > + return err; > + extoff->ts[i][0].sec = sts.pre_ts.tv_sec; > + extoff->ts[i][0].nsec = sts.pre_ts.tv_nsec; > + extoff->ts[i][1].sec = ts.tv_sec; > + extoff->ts[i][1].nsec = ts.tv_nsec; > + extoff->ts[i][2].sec = sts.post_ts.tv_sec; > + extoff->ts[i][2].nsec = sts.post_ts.tv_nsec; > + } > + > + return copy_to_user(arg, extoff, sizeof(*extoff)) ? -EFAULT : 0; > +} > + > long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd, > unsigned long arg) > { > struct ptp_clock *ptp = > container_of(pccontext->clk, struct ptp_clock, clock); > - struct ptp_sys_offset_extended *extoff = NULL; > struct ptp_clock_info *ops = ptp->info; > struct ptp_sys_offset *sysoff = NULL; > struct timestamp_event_queue *tsevq; > - struct ptp_system_timestamp sts; > struct ptp_clock_time *pct; > unsigned int i, pin_index; > struct ptp_pin_desc pd; > @@ -371,39 +407,7 @@ long ptp_ioctl(struct posix_clock_contex > > case PTP_SYS_OFFSET_EXTENDED: > case PTP_SYS_OFFSET_EXTENDED2: > - if (!ptp->info->gettimex64) { > - err = -EOPNOTSUPP; > - break; > - } > - extoff = memdup_user((void __user *)arg, sizeof(*extoff)); > - if (IS_ERR(extoff)) { > - err = PTR_ERR(extoff); > - extoff = NULL; > - break; > - } > - if (extoff->n_samples > PTP_MAX_SAMPLES || > - extoff->rsv[0] || extoff->rsv[1] || > - (extoff->clockid != CLOCK_REALTIME && > - extoff->clockid != CLOCK_MONOTONIC && > - extoff->clockid != CLOCK_MONOTONIC_RAW)) { > - err = -EINVAL; > - break; > - } > - sts.clockid = extoff->clockid; > - for (i = 0; i < extoff->n_samples; i++) { > - err = ptp->info->gettimex64(ptp->info, &ts, &sts); > - if (err) > - goto out; > - extoff->ts[i][0].sec = sts.pre_ts.tv_sec; > - extoff->ts[i][0].nsec = sts.pre_ts.tv_nsec; > - extoff->ts[i][1].sec = ts.tv_sec; > - extoff->ts[i][1].nsec = ts.tv_nsec; > - extoff->ts[i][2].sec = sts.post_ts.tv_sec; > - extoff->ts[i][2].nsec = sts.post_ts.tv_nsec; > - } > - if (copy_to_user((void __user *)arg, extoff, sizeof(*extoff))) > - err = -EFAULT; > - break; > + return ptp_sys_offset_extended(ptp, argptr); > > case PTP_SYS_OFFSET: > case PTP_SYS_OFFSET2: > @@ -528,7 +532,6 @@ long ptp_ioctl(struct posix_clock_contex > } > > out: > - kfree(extoff); > kfree(sysoff); > return err; > } > Reviewed-by: Vadim Fedorenko