tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'char-misc-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc fixes from Greg KH:
"Here are some small char/misc driver fixes for 4.6-rc4. Full details
are in the shortlog, nothing major here.

These have all been in linux-next for a while with no reported issues"

* tag 'char-misc-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
lkdtm: do not leak free page on kmalloc failure
lkdtm: fix memory leak of base
lkdtm: fix memory leak of val
extcon: palmas: Drop stray IRQF_EARLY_RESUME flag

Linus Torvalds b9f5dba2 e1e22b27

+9 -5
+1 -2
drivers/extcon/extcon-palmas.c
··· 348 348 palmas_vbus_irq_handler, 349 349 IRQF_TRIGGER_FALLING | 350 350 IRQF_TRIGGER_RISING | 351 - IRQF_ONESHOT | 352 - IRQF_EARLY_RESUME, 351 + IRQF_ONESHOT, 353 352 "palmas_usb_vbus", 354 353 palmas_usb); 355 354 if (status < 0) {
+8 -3
drivers/misc/lkdtm.c
··· 458 458 break; 459 459 460 460 val = kmalloc(len, GFP_KERNEL); 461 - if (!val) 461 + if (!val) { 462 + kfree(base); 462 463 break; 464 + } 463 465 464 466 *val = 0x12345678; 465 467 base[offset] = *val; ··· 500 498 } 501 499 case CT_READ_BUDDY_AFTER_FREE: { 502 500 unsigned long p = __get_free_page(GFP_KERNEL); 503 - int saw, *val = kmalloc(1024, GFP_KERNEL); 501 + int saw, *val; 504 502 int *base; 505 503 506 504 if (!p) 507 505 break; 508 506 509 - if (!val) 507 + val = kmalloc(1024, GFP_KERNEL); 508 + if (!val) { 509 + free_page(p); 510 510 break; 511 + } 511 512 512 513 base = (int *)p; 513 514