shark/bbswitch-g14
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix misuse of sizeof which trims arguments/muid (GH-12)

Browse Source
This commit is contained in:
Lekensteyn 2012-02-29 00:10:32 +01:00
parent 7c30e38bd1
commit 804773eb22
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bbswitch.c
View File

@ -71,12 +71,12 @@ static struct notifier_block nb;
/* whether the card was off before suspend or not; on: 0, off: 1 */ /* whether the card was off before suspend or not; on: 0, off: 1 */
int dis_before_suspend_disabled; int dis_before_suspend_disabled;
static char *buffer_to_string(const char buffer[], char *target) { static char *buffer_to_string(const char *buffer, size_t n, char *target) {
int i; int i;
for (i=0; i<sizeof(buffer); i++) { for (i=0; i<n; i++) {
sprintf(target + i * 5, "%02X,", buffer[i]); sprintf(target + i * 5, "%02X,", buffer[i]);
} }
target[sizeof(buffer) * 5] = '\0'; target[n * 5] = '\0';
return target; return target;
} }
@ -112,12 +112,12 @@ static int acpi_call_dsm(acpi_handle handle, const char muid[16], int revid,
err = acpi_evaluate_object(handle, "_DSM", &input, &output); err = acpi_evaluate_object(handle, "_DSM", &input, &output);
if (err) { if (err) {
char tmp[5 * max(sizeof(muid), sizeof(args))]; char tmp[5 * 16]; /* enough space for muid or args with separators */
printk(KERN_WARNING "bbswitch: failed to evaluate _DSM {%s} %X %X" printk(KERN_WARNING "bbswitch: failed to evaluate _DSM {%s} %X %X"
" {%s}: %s\n", " {%s}: %s\n",
buffer_to_string(muid, tmp), revid, func, buffer_to_string(muid, 16, tmp), revid, func,
buffer_to_string(args, tmp), acpi_format_exception(err)); buffer_to_string(args, 4, tmp), acpi_format_exception(err));
return err; return err;
} }