From: Mariia Nikitash <nikitash.mariiaw@gmail.com>
To: abbotti@mev.co.uk, hsweeten@visionengravers.com
Cc: linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org,
morbo@google.com, kees@kernel.org, justinstitt@google.com,
codemender-patching+linux@google.com,
Mariia Nikitash <nikitash.mariiaw@gmail.com>
Subject: [PATCH] comedi: comedi_bond: Refactor strlcat() to seq_buf in do_dev_config()
Date: Sat, 26 Sep 2026 23:00:00 -0700 [thread overview]
Message-ID: <20260927060000.518354-1-nikitash.mariiaw@gmail.com> (raw)
From: Bill Wendling <morbo@google.com>
do_dev_config() builds a space-separated list of bonded devices in
devpriv->name by formatting each "minor:subdev " pair into a temporary
stack buffer with snprintf() and appending it with strlcat() in a loop.
In preparation for removing the deprecated strlcat() API[1], use struct
seq_buf and seq_buf_printf() to format each entry directly into
devpriv->name. This avoids repeated rescanning of devpriv->name and
eliminates the temporary buffer.
Link: https://github.com/KSPP/linux/issues/370 [1]
Cc: codemender-patching+linux@google.com
Assisted-by: LLM
Signed-off-by: Bill Wendling <morbo@google.com>
Signed-off-by: Mariia Nikitash <nikitash.mariiaw@gmail.com>
---
drivers/comedi/drivers/comedi_bond.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/comedi/drivers/comedi_bond.c b/drivers/comedi/drivers/comedi_bond.c
index 8e10ecab4f0d..a10cfbd04c72 100644
--- a/drivers/comedi/drivers/comedi_bond.c
+++ b/drivers/comedi/drivers/comedi_bond.c
@@ -39,6 +39,7 @@
#include <linux/module.h>
#include <linux/string.h>
+#include <linux/seq_buf.h>
#include <linux/slab.h>
#include <linux/comedi.h>
#include <linux/comedi/comedilib.h>
@@ -170,10 +171,11 @@ static int do_dev_config(struct comedi_device *dev, struct comedi_devconfig *it)
{
struct comedi_bond_private *devpriv = dev->private;
DECLARE_BITMAP(devs_opened, COMEDI_NUM_BOARD_MINORS);
+ struct seq_buf s;
int i;
memset(&devs_opened, 0, sizeof(devs_opened));
- devpriv->name[0] = 0;
+ seq_buf_init(&s, devpriv->name, sizeof(devpriv->name));
/*
* Loop through all comedi devices specified on the command-line,
* building our device list.
@@ -250,15 +252,9 @@ static int do_dev_config(struct comedi_device *dev, struct comedi_devconfig *it)
}
devpriv->devs = devs;
devpriv->devs[devpriv->ndevs++] = bdev;
- {
- /* Append dev:subdev to devpriv->name */
- char buf[20];
-
- snprintf(buf, sizeof(buf), "%u:%u ",
- bdev->minor, bdev->subdev);
- strlcat(devpriv->name, buf,
- sizeof(devpriv->name));
- }
+
+ /* Append dev:subdev to devpriv->name */
+ seq_buf_printf(&s, "%u:%u ", bdev->minor, bdev->subdev);
}
}
@@ -267,6 +263,8 @@ static int do_dev_config(struct comedi_device *dev, struct comedi_devconfig *it)
return -EINVAL;
}
+ seq_buf_str(&s);
+
return 0;
}
--
2.43.0
next reply other threads:[~2026-09-27 6:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-27 6:00 Mariia Nikitash [this message]
2026-09-28 10:02 ` Ian Abbott
2026-11-12 18:39 ` Kees Cook
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=20260927060000.518354-1-nikitash.mariiaw@gmail.com \
--to=nikitash.mariiaw@gmail.com \
--cc=abbotti@mev.co.uk \
--cc=codemender-patching+linux@google.com \
--cc=hsweeten@visionengravers.com \
--cc=justinstitt@google.com \
--cc=kees@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=morbo@google.com \
/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
all inboxes | Powered by JetHome®