From: Calvince Otieno <calvncce@gmail.com>
To: outreachy@lists.linux.dev, linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Archana <craechal@gmail.com>, Dan Carpenter <error27@gmail.com>,
Simon Horman <horms@kernel.org>,
Bagas Sanjaya <bagasdotme@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH v2] staging/wlan-ng: remove strcpy() use in favor of strscpy()
Date: Thu, 12 Oct 2023 17:01:57 +0300 [thread overview]
Message-ID: <ZSf8VcH8JQ+L+Z/r@lab-ubuntu> (raw)
In response to the suggestion by Dan Carpenter on the initial patch,
this patch provides a correct usage of the strscpy() in place of the
current strcpy() implementation.
strscpy() copies characters from the source buffer to the destination
buffer until one of the following conditions is met:
- null-terminator ('\0') is encountered in the source string.
- specified maximum length of the destination buffer is reached.
- source buffer is exhausted.
Example:
char dest[11];
const char *PRISM2_USB_FWFILE = "prism2_ru.fw";
strscpy(dest, PRISM2_USB_FWFILE, sizeof(dest));
In this case, strscpy copies the first 10 characters of src into dest
and add a null-terminator. dest will then contain "prism2_ru.f" with
proper null-termination.
Since the specified length of the dest buffer is not derived from the
dest buffer itself and rather form plug length (s3plug[i].len),
replacing strcpy() with strscpy() is a better option because it will
ensures that the destination string is always properly terminated.
Signed-off-by: Calvince Otieno <calvncce@gmail.com>
---
drivers/staging/wlan-ng/prism2fw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c
index 5d03b2b9aab4..3ccd11041646 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -725,7 +725,7 @@ static int plugimage(struct imgchunk *fchunk, unsigned int nfchunks,
if (j == -1) { /* plug the filename */
memset(dest, 0, s3plug[i].len);
- strncpy(dest, PRISM2_USB_FWFILE, s3plug[i].len - 1);
+ strscpy(dest, PRISM2_USB_FWFILE, s3plug[i].len);
} else { /* plug a PDR */
memcpy(dest, &pda->rec[j]->data, s3plug[i].len);
}
--
2.34.1
next reply other threads:[~2023-10-12 14:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 14:01 Calvince Otieno [this message]
2023-10-12 16:42 ` [PATCH v2] staging/wlan-ng: remove strcpy() use in favor of strscpy() Greg Kroah-Hartman
2023-10-12 17:47 ` Calvince Otieno
2023-10-12 18:06 ` Philipp Hortmann
2023-10-13 8:39 ` Dan Carpenter
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=ZSf8VcH8JQ+L+Z/r@lab-ubuntu \
--to=calvncce@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=craechal@gmail.com \
--cc=error27@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=horms@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=outreachy@lists.linux.dev \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).