A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

USB: storage: Replace the sprintf with scnprintf

Browse source 
'sprintf' has been deprecated, hence replace it with
a safer function scnprintf.

Change-Id: I9bc8e3dfd2032a0447f38fc98a3ad31d9d609cab
Signed-off-by: Rajashekar kuruva <quic_kuruva@quicinc.com>
Signed-off-by: Prashanth K <quic_prashk@quicinc.com>
This commit is contained in:
Rajashekar kuruva 2023-11-07 11:27:49 +05:30 • committed by Prashanth K
commit 54d3e3ca11
2 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/usb/storage/freecom.c
View file

@ -494,12 +494,12 @@ static void pdump(struct us_data *us, void *ibuffer, int length)
unsigned char *buffer = (unsigned char *) ibuffer;
int i, j;
int from, base;
size_t size = sizeof(line);
offset = 0;
for (i = 0; i < length; i++) {
if ((i & 15) == 0) {
if (i > 0) {
offset += sprintf (line+offset, " - ");
offset += scnprintf(line+offset, size-offset, " - ");
for (j = i - 16; j < i; j++) {
if (buffer[j] >= 32 && buffer[j] <= 126)
line[offset++] = buffer[j];
@ -510,11 +510,11 @@ static void pdump(struct us_data *us, void *ibuffer, int length)
usb_stor_dbg(us, "%s\n", line);
offset = 0;
}
offset += sprintf (line+offset, "%08x:", i);
offset += scnprintf(line+offset, size-offset, "%08x:", i);
} else if ((i & 7) == 0) {
offset += sprintf (line+offset, " -");
offset += scnprintf(line+offset, size-offset, " -");
}
offset += sprintf (line+offset, " %02x", buffer[i] & 0xff);
offset += scnprintf(line+offset, size-offset, " %02x", buffer[i] & 0xff);
}
/* Add the last "chunk" of data. */
@ -522,10 +522,10 @@ static void pdump(struct us_data *us, void *ibuffer, int length)
base = ((length - 1) / 16) * 16;
for (i = from + 1; i < 16; i++)
offset += sprintf (line+offset, " ");
offset += scnprintf(line+offset, size-offset, " ");
if (from < 8)
offset += sprintf (line+offset, " ");
offset += sprintf (line+offset, " - ");
offset += scnprintf(line+offset, size-offset, " ");
offset += scnprintf(line+offset, size-offset, " - ");
for (i = 0; i <= from; i++) {
if (buffer[base+i] >= 32 && buffer[base+i] <= 126)

39
drivers/usb/storage/sddr09.c
View file

@ -1139,6 +1139,8 @@ sddr09_get_cardinfo(struct us_data *us, unsigned char flags) {
unsigned char deviceID[4];
char blurbtxt[256];
int result;
size_t size = sizeof(blurbtxt);
int len;
usb_stor_dbg(us, "Reading capacity...\n");
@ -1150,10 +1152,11 @@ sddr09_get_cardinfo(struct us_data *us, unsigned char flags) {
return NULL;
}
sprintf(blurbtxt, "sddr09: Found Flash card, ID = %4ph", deviceID);
scnprintf(blurbtxt, size, "sddr09: Found Flash card, ID = %4ph", deviceID);
/* Byte 0 is the manufacturer */
sprintf(blurbtxt + strlen(blurbtxt),
len = strlen(blurbtxt);
scnprintf(blurbtxt + len, size - len,
": Manuf. %s",
nand_flash_manufacturer(deviceID[0]));
@ -1165,29 +1168,34 @@ sddr09_get_cardinfo(struct us_data *us, unsigned char flags) {
* 17301504 raw bytes, of which 16384000 are
* usable for user data.
*/
sprintf(blurbtxt + strlen(blurbtxt),
len = strlen(blurbtxt);
scnprintf(blurbtxt + len, size - len,
", %d MB", 1<<(cardinfo->chipshift - 20));
} else {
sprintf(blurbtxt + strlen(blurbtxt),
len = strlen(blurbtxt);
scnprintf(blurbtxt + len, size - len,
", type unrecognized");
}
/* Byte 2 is code to signal availability of 128-bit ID */
if (deviceID[2] == 0xa5) {
sprintf(blurbtxt + strlen(blurbtxt),
len = strlen(blurbtxt);
scnprintf(blurbtxt + len, size - len,
", 128-bit ID");
}
/* Byte 3 announces the availability of another read ID command */
if (deviceID[3] == 0xc0) {
sprintf(blurbtxt + strlen(blurbtxt),
len = strlen(blurbtxt);
scnprintf(blurbtxt + len, size - len,
", extra cmd");
}
if (flags & SDDR09_WP)
sprintf(blurbtxt + strlen(blurbtxt),
if (flags & SDDR09_WP) {
len = strlen(blurbtxt);
scnprintf(blurbtxt + len, size - len,
", WP");
}
printk(KERN_WARNING "%s\n", blurbtxt);
return cardinfo;
@ -1538,7 +1546,8 @@ static int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us)
{
static unsigned char sensekey = 0, sensecode = 0;
static unsigned char havefakesense = 0;
int result, i;
int result, i, len;
size_t size;
unsigned char *ptr = us->iobuf;
unsigned long capacity;
unsigned int page, pages;
@ -1701,9 +1710,11 @@ static int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us)
srb->cmnd[1] = LUNBITS;
ptr[0] = 0;
for (i=0; i<12; i++)
sprintf(ptr+strlen(ptr), "%02X ", srb->cmnd[i]);
size = sizeof(ptr);
for (i = 0; i < 12; i++) {
len = strlen(ptr);
scnprintf(ptr+len, size-len, "%02X ", srb->cmnd[i]);
}
usb_stor_dbg(us, "Send control for command %s\n", ptr);
result = sddr09_send_scsi_command(us, srb->cmnd, 12);
@ -1730,7 +1741,7 @@ static int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us)
return (result == USB_STOR_XFER_GOOD ?
USB_STOR_TRANSPORT_GOOD : USB_STOR_TRANSPORT_ERROR);
}
}
return USB_STOR_TRANSPORT_GOOD;
}