Merge tag 'for-linus-6.7-1' of https://github.com/cminyard/linux-ipmi
Pull IPMI update from Corey Minyard: "Only one change, and I would normally just wait, but it will make the people trying to get rid of strncpy happy. Its a good change, anyway" * tag 'for-linus-6.7-1' of https://github.com/cminyard/linux-ipmi: ipmi: refactor deprecated strncpy
This commit is contained in:
@@ -5377,20 +5377,15 @@ static void send_panic_events(struct ipmi_smi *intf, char *str)
|
||||
|
||||
j = 0;
|
||||
while (*p) {
|
||||
int size = strlen(p);
|
||||
int size = strnlen(p, 11);
|
||||
|
||||
if (size > 11)
|
||||
size = 11;
|
||||
data[0] = 0;
|
||||
data[1] = 0;
|
||||
data[2] = 0xf0; /* OEM event without timestamp. */
|
||||
data[3] = intf->addrinfo[0].address;
|
||||
data[4] = j++; /* sequence # */
|
||||
/*
|
||||
* Always give 11 bytes, so strncpy will fill
|
||||
* it with zeroes for me.
|
||||
*/
|
||||
strncpy(data+5, p, 11);
|
||||
|
||||
memcpy_and_pad(data+5, 11, p, size, '\0');
|
||||
p += size;
|
||||
|
||||
ipmi_panic_request_and_wait(intf, &addr, &msg);
|
||||
|
||||
@@ -1945,7 +1945,7 @@ static int new_ssif_client(int addr, char *adapter_name,
|
||||
}
|
||||
}
|
||||
|
||||
strncpy(addr_info->binfo.type, DEVICE_NAME,
|
||||
strscpy(addr_info->binfo.type, DEVICE_NAME,
|
||||
sizeof(addr_info->binfo.type));
|
||||
addr_info->binfo.addr = addr;
|
||||
addr_info->binfo.platform_data = addr_info;
|
||||
|
||||
Reference in New Issue
Block a user