public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 5.10.y] comedi: Fail COMEDI_INSNLIST ioctl if n_insns is too large
Date: Fri, 25 Jul 2025 19:24:32 -0400	[thread overview]
Message-ID: <1753464513-b037f6b7@stable.kernel.org> (raw)
In-Reply-To: <20250724181646.291939-1-abbotti@mev.co.uk>

[ Sasha's backport helper bot ]

Hi,

✅ All tests passed successfully. No issues detected.
No action required from the submitter.

The upstream commit SHA1 provided is correct: 08ae4b20f5e82101d77326ecab9089e110f224cc

Status in newer kernel trees:
6.15.y | Not found
6.12.y | Not found
6.6.y | Not found
6.1.y | Not found
5.15.y | Not found

Note: The patch differs from the upstream commit:
---
1:  08ae4b20f5e8 ! 1:  4a8bada4e031 comedi: Fail COMEDI_INSNLIST ioctl if n_insns is too large
    @@ Metadata
      ## Commit message ##
         comedi: Fail COMEDI_INSNLIST ioctl if n_insns is too large
     
    +    [ Upstream commit 08ae4b20f5e82101d77326ecab9089e110f224cc ]
    +
         The handling of the `COMEDI_INSNLIST` ioctl allocates a kernel buffer to
         hold the array of `struct comedi_insn`, getting the length from the
         `n_insns` member of the `struct comedi_insnlist` supplied by the user.
    @@ Commit message
         Link: https://lore.kernel.org/r/20250704120405.83028-1-abbotti@mev.co.uk
         Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
     
    - ## drivers/comedi/comedi_fops.c ##
    -@@ drivers/comedi/comedi_fops.c: static int do_insnlist_ioctl(struct comedi_device *dev,
    + ## drivers/staging/comedi/comedi_fops.c ##
    +@@ drivers/staging/comedi/comedi_fops.c: static int do_insnlist_ioctl(struct comedi_device *dev,
      	return i;
      }
      
    @@ drivers/comedi/comedi_fops.c: static int do_insnlist_ioctl(struct comedi_device
      /*
       * COMEDI_INSN ioctl
       * synchronous instruction
    -@@ drivers/comedi/comedi_fops.c: static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
    +@@ drivers/staging/comedi/comedi_fops.c: static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
      			rc = -EFAULT;
      			break;
      		}
    @@ drivers/comedi/comedi_fops.c: static long comedi_unlocked_ioctl(struct file *fil
      		insns = kcalloc(insnlist.n_insns, sizeof(*insns), GFP_KERNEL);
      		if (!insns) {
      			rc = -ENOMEM;
    -@@ drivers/comedi/comedi_fops.c: static int compat_insnlist(struct file *file, unsigned long arg)
    +@@ drivers/staging/comedi/comedi_fops.c: static int compat_insnlist(struct file *file, unsigned long arg)
      	if (copy_from_user(&insnlist32, compat_ptr(arg), sizeof(insnlist32)))
      		return -EFAULT;
      

---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| origin/linux-5.10.y       | Success     | Success    |

  parent reply	other threads:[~2025-07-25 23:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-24 18:16 [PATCH 5.10.y] comedi: Fail COMEDI_INSNLIST ioctl if n_insns is too large Ian Abbott
2025-07-24 18:21 ` Ian Abbott
2025-07-25 23:24 ` Sasha Levin [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-24 18:12 Ian Abbott
2025-07-26  1:01 ` Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1753464513-b037f6b7@stable.kernel.org \
    --to=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox