Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drivers: usb: add toggle for disabling newly added USB devices

Browse source 
Based on the public grsecurity patches.

Signed-off-by: anupritaisno1 <www.anuprita804@gmail.com>
This commit is contained in:
Daniel Micay 2017-05-16 17:51:48 -04:00 • committed by Gabriel2392
parent 9b8f55709b
commit 27a7d44ba5
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/usb/core/hub.c
View file

@ -52,6 +52,8 @@
#define USB_TP_TRANSMISSION_DELAY_MAX 65535 /* ns */ #define USB_TP_TRANSMISSION_DELAY_MAX 65535 /* ns */
#define USB_PING_RESPONSE_TIME 400 /* ns */ #define USB_PING_RESPONSE_TIME 400 /* ns */
extern int deny_new_usb;
/* Protect struct usb_device->state and ->children members /* Protect struct usb_device->state and ->children members
* Note: Both are also protected by ->dev.sem, except that ->state can * Note: Both are also protected by ->dev.sem, except that ->state can
* change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */ * change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */
@ -5368,6 +5370,11 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
if (unreliable_port == port1) if (unreliable_port == port1)
unreliable_port = -1; unreliable_port = -1;
if (deny_new_usb) {
dev_err(&port_dev->dev, "denied insert of USB device on port %d\n", port1);
goto done;
}
if (hub_is_superspeed(hub->hdev)) if (hub_is_superspeed(hub->hdev))
unit_load = 150; unit_load = 150;
else else

15
kernel/sysctl.c
View file

@ -112,6 +112,10 @@
/* External variables not in a header file. */ /* External variables not in a header file. */
extern int extra_free_kbytes; extern int extra_free_kbytes;
#if IS_ENABLED(CONFIG_USB)
int deny_new_usb __read_mostly = 0;
EXPORT_SYMBOL(deny_new_usb);
#endif
/* Constants used for minimum and maximum */ /* Constants used for minimum and maximum */
#ifdef CONFIG_LOCKUP_DETECTOR #ifdef CONFIG_LOCKUP_DETECTOR
@ -2353,6 +2357,17 @@ static struct ctl_table kern_table[] = {
.extra1 = SYSCTL_ZERO, .extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_TWO, .extra2 = SYSCTL_TWO,
}, },
#endif
#if IS_ENABLED(CONFIG_USB)
{
.procname = "deny_new_usb",
.data = &deny_new_usb,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax_sysadmin,
.extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE,
},
#endif #endif
{ {
.procname = "ngroups_max", .procname = "ngroups_max",