From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp78.iad3b.emailsrvr.com (smtp78.iad3b.emailsrvr.com [146.20.161.78]) (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 E51223EF673 for ; Tue, 9 Jun 2026 10:46:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=146.20.161.78 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781002011; cv=none; b=Y1eDzE4jyK9wrwg3WRvEjGK9cBNNRTqaLFYLtlvOHLKnV8V1iNX199rWAPQSXM9UOXeiHCFxY6+wGUX5UP3olTWq0qdVbLEeVR+e/yqKyD90e1BqtEE/pOm2m76lV5+PwjTImGz2RF0ngFVSDO8S4ZvXFXTTJvy4nF+3Vey6x2I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781002011; c=relaxed/simple; bh=AXuJCaJGm+XnA+gT0wF5UBkZ5TXZAQC68hJCZCRo4YE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=qaDie495h1jcZnyNX6v+CwZ6URukEYXqNfnSoJQWXkYp3nxS4t+6eLemM1H5LrkYV+FyimPtndIFE/eo7d6Sq0bjALP7/1bsw68T4qwO6pwdAZ/2eTCFGgVoVKQhLtxbpB+3N4jZ+NX2+MGFJ46IYmpyoZufC6JTwYW7GKBWsBo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mev.co.uk; spf=pass smtp.mailfrom=mev.co.uk; dkim=pass (1024-bit key) header.d=mev.co.uk header.i=@mev.co.uk header.b=wKKhmqOI; arc=none smtp.client-ip=146.20.161.78 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mev.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mev.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mev.co.uk header.i=@mev.co.uk header.b="wKKhmqOI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mev.co.uk; s=20221208-6x11dpa4; t=1781000939; bh=AXuJCaJGm+XnA+gT0wF5UBkZ5TXZAQC68hJCZCRo4YE=; h=Date:Subject:To:From:From; b=wKKhmqOInXdQ45oVliOB8sJz+EKH33meNQtXh2zlcylst2npZScNnEg574mr0nwRv Td/xE/peh2yLPBxtDL1yazhOXSfaMwEo0LzY8A24U29rvegbMD2eOXSEYWLpcvmJ9n lVLYUKZHu+aRkaJjuOjdDsz2uIcu7ajoLMBReuiE= X-Auth-ID: abbotti@mev.co.uk Received: by smtp10.relay.iad3b.emailsrvr.com (Authenticated sender: abbotti-AT-mev.co.uk) with ESMTPSA id 636F6E00E1; Tue, 9 Jun 2026 06:28:59 -0400 (EDT) Message-ID: <2eb34fcb-61d7-4fad-8567-3b7f34a9ef09@mev.co.uk> Date: Tue, 9 Jun 2026 11:28:58 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] comedi: comedi_test: avoid AI scan timing overflow To: Samuel Moelius Cc: H Hartley Sweeten , Greg Kroah-Hartman , open list References: <20260609001221.1234948.362a4ba725ef.comedi-test-ai-timing-overflow@trailofbits.com> Content-Language: en-GB From: Ian Abbott Organization: MEV Ltd. In-Reply-To: <20260609001221.1234948.362a4ba725ef.comedi-test-ai-timing-overflow@trailofbits.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Classification-ID: 584d5021-6dd2-4d87-a90f-393f4d638962-1-1 On 09/06/2026 01:14, Samuel Moelius wrote: > `waveform_ai_cmdtest()` tries to keep timer-driven analog-input scans > representable by limiting `convert_arg` and by making `scan_begin_arg` > at least `convert_arg * scan_end_arg`. > > The conversion clamp tested `scan_begin_arg == TRIG_TIMER` instead of > `scan_begin_src == TRIG_TIMER`, so normal timer scans skipped the clamp. That was fixed in commit 8a3bee801d42 ("comedi: comedi_test: Fix limiting of convert_arg in waveform_ai_cmdtest()"). > The later product was computed in `unsigned int`, allowing a large > conversion period to wrap and produce an accepted command whose true > scan conversion time exceeds the scan period. Commit 783ddaebd397 ("staging: comedi: comedi_test: support scan_begin_src == TRIG_FOLLOW") imposed an upper limit on `convert_arg` to stop the product `convert_arg * scan_end_arg` overflowing an `unsigned int`. > Require timer conversions to be at least one microsecond, apply the > conversion limit when `scan_begin_src` is `TRIG_TIMER`, keep that limit > on the same microsecond granularity as the rounded argument, and compute > the scan-period floor in 64-bit before clamping it back to the ioctl > argument range. We could do that but it doesn't really matter for this driver. It already supports `convert_src == TRIG_NOW` with `convert_src == 0` and that is pretty much the same as `convert_src == TRIG_TIMER` with `convert_src == 0`. The current implementation just allows `convert_arg` to be arbitrarily small (including 0) when `convert_src == TRIG_TIMER` except when `scan_begin_src == TRIG_FOLLOW` because that would also make the overall scan period arbitrarily small, which we do not want. > > Assisted-by: Codex:gpt-5.5-cyber-preview > Signed-off-by: Samuel Moelius > --- > drivers/comedi/drivers/comedi_test.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) > > diff --git a/drivers/comedi/drivers/comedi_test.c b/drivers/comedi/drivers/comedi_test.c > index 1f430ffc7bd9..04b982f69751 100644 > --- a/drivers/comedi/drivers/comedi_test.c > +++ b/drivers/comedi/drivers/comedi_test.c > @@ -256,7 +256,8 @@ static int waveform_ai_cmdtest(struct comedi_device *dev, > struct comedi_cmd *cmd) > { > int err = 0; > - unsigned int arg, limit; > + unsigned int arg, limit, min_scan_arg; > + u64 min_scan_time; > > /* Step 1 : check if triggers are trivially valid */ > > @@ -292,10 +293,8 @@ static int waveform_ai_cmdtest(struct comedi_device *dev, > if (cmd->convert_src == TRIG_NOW) { > err |= comedi_check_trigger_arg_is(&cmd->convert_arg, 0); > } else { /* cmd->convert_src == TRIG_TIMER */ > - if (cmd->scan_begin_src == TRIG_FOLLOW) { > - err |= comedi_check_trigger_arg_min(&cmd->convert_arg, > - NSEC_PER_USEC); > - } > + err |= comedi_check_trigger_arg_min(&cmd->convert_arg, > + NSEC_PER_USEC); > } > > if (cmd->scan_begin_src == TRIG_FOLLOW) { > @@ -342,7 +341,12 @@ static int waveform_ai_cmdtest(struct comedi_device *dev, > arg = NSEC_PER_USEC * DIV_ROUND_CLOSEST(arg, NSEC_PER_USEC); > if (cmd->convert_src == TRIG_TIMER) { > /* but ensure scan_begin_arg is large enough */ > - arg = max(arg, cmd->convert_arg * cmd->scan_end_arg); > + min_scan_time = (u64)cmd->convert_arg * cmd->scan_end_arg; > + if (min_scan_time > UINT_MAX) > + min_scan_arg = UINT_MAX; > + else > + min_scan_arg = min_scan_time; > + arg = max(arg, min_scan_arg); > } > err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, arg); > } -- -=( Ian Abbott || MEV Ltd. is a company )=- -=( registered in England & Wales. Regd. number: 02862268. )=- -=( Regd. addr.: S11 & 12 Building 67, Europa Business Park, )=- -=( Bird Hall Lane, STOCKPORT, SK3 0XA, UK. || www.mev.co.uk )=-