From: Abhishek Tamboli <abhishektamboli9@gmail.com>
To: gregkh@linuxfoundation.org
Cc: tdavies@darkphysics.net, philipp.g.hortmann@gmail.com,
garyrookard@fastmail.org, linux-staging@lists.linux.dev,
skhan@linuxfoundation.org, rbmarliere@gmail.com,
dan.carpenter@linaro.org, christophe.jaillet@wanadoo.fr,
linux-kernel-mentees@lists.linuxfoundation.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2] staging: rtl8192e: Replace strcpy with strcat in rtl819x_translate_scan
Date: Fri, 23 Aug 2024 21:04:11 +0530 [thread overview]
Message-ID: <20240823153411.74142-1-abhishektamboli9@gmail.com> (raw)
Replace strcpy() with strcat() in rtl819x_translate_scan()
Also Fix proto_name[] buffer size issue to accommodate all
network modes.
Signed-off-by: Abhishek Tamboli <abhishektamboli9@gmail.com>
---
Changes in v2:
- Revert the use of strscpy and replaced it with strcat.
- Remove the 'pname' and replace it's usage with direct
operations on 'proto_name' buffer.
drivers/staging/rtl8192e/rtllib_wx.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index fbd4ec824084..ec0c4c5bade7 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -23,14 +23,14 @@ static const char * const rtllib_modes[] = {
};
#define MAX_CUSTOM_LEN 64
+#define MAX_PROTO_NAME_LEN 10
static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
char *start, char *stop,
struct rtllib_network *network,
struct iw_request_info *info)
{
char custom[MAX_CUSTOM_LEN];
- char proto_name[6];
- char *pname = proto_name;
+ char proto_name[MAX_PROTO_NAME_LEN];
char *p;
struct iw_event iwe;
int i, j;
@@ -59,13 +59,12 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
+ /* Initialise proto_name as an empty string*/
+ memset(proto_name, '\0', sizeof(proto_name));
for (i = 0; i < ARRAY_SIZE(rtllib_modes); i++) {
- if (network->mode & BIT(i)) {
- strcpy(pname, rtllib_modes[i]);
- pname += strlen(rtllib_modes[i]);
+ if (network->mode & BIT(i))
+ strcat(proto_name, rtllib_modes[i]);
}
- }
- *pname = '\0';
snprintf(iwe.u.name, IFNAMSIZ, "IEEE802.11%s", proto_name);
start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN);
/* Add mode */
--
2.34.1
next reply other threads:[~2024-08-23 15:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-23 15:34 Abhishek Tamboli [this message]
2024-08-24 5:45 ` [PATCH v2] staging: rtl8192e: Replace strcpy with strcat in rtl819x_translate_scan Greg KH
2024-08-24 16:59 ` Abhishek Tamboli
2024-08-24 11:21 ` Dan Carpenter
2024-08-24 17:09 ` Abhishek Tamboli
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=20240823153411.74142-1-abhishektamboli9@gmail.com \
--to=abhishektamboli9@gmail.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=dan.carpenter@linaro.org \
--cc=garyrookard@fastmail.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=philipp.g.hortmann@gmail.com \
--cc=rbmarliere@gmail.com \
--cc=skhan@linuxfoundation.org \
--cc=tdavies@darkphysics.net \
/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