From: a17671 Date: Mon, 21 Jan 2019 09:31:14 +0000 (+0800) Subject: Add the support of usb secure hardware checking X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3095bd5dfc8b23a9533bd9c8f52cfcea9b2ec48f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Add the support of usb secure hardware checking Usb secure hardware checking does not exist on samsung platform Add the support after security feature ready Change-Id: I16b8ebd5ef57144c9c23adc897f562890b6e53b4 Signed-off-by: a17671 Reviewed-on: https://gerrit.mot.com/1297617 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c index dbd3d02d6f9d..028729f5a2ff 100755 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -103,6 +103,7 @@ struct gadget_info { struct device *dev; struct list_head linked_func; #endif + bool secure; }; static inline struct gadget_info *to_gadget_info(struct config_item *item) @@ -343,10 +344,12 @@ static ssize_t gadget_dev_desc_UDC_store(struct config_item *item, goto err; } gi->composite.gadget_driver.udc_name = name; - ret = usb_gadget_probe_driver(&gi->composite.gadget_driver); - if (ret) { - gi->composite.gadget_driver.udc_name = NULL; - goto err; + if (!gi->secure) { + ret = usb_gadget_probe_driver(&gi->composite.gadget_driver); + if (ret) { + gi->composite.gadget_driver.udc_name = NULL; + goto err; + } } } mutex_unlock(&gi->lock); @@ -1955,6 +1958,63 @@ static DEVICE_ATTR(functions, S_IRUGO | S_IWUSR, functions_show, static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, enable_show, enable_store); static DEVICE_ATTR(state, S_IRUGO, state_show, NULL); +static ssize_t secure_show(struct device *pdev, struct device_attribute *attr, + char *buf) +{ + struct gadget_info *gi = dev_get_drvdata(pdev); + + if (!gi) + return -ENODEV; + + return scnprintf(buf, PAGE_SIZE, "%d\n", gi->secure); +} + +static ssize_t secure_store(struct device *pdev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct gadget_info *gi = dev_get_drvdata(pdev); + unsigned long mode, r; + int ret; + + if (!gi) + return -ENODEV; + + r = kstrtoul(buf, 0, &mode); + if (r) { + dev_err(pdev, "Invalid value = %lu\n", mode); + return -EINVAL; + } + + mode = !!mode; + if (mode == gi->secure) + return count; + gi->secure = mode; + + if (!gi->composite.gadget_driver.udc_name) + return count; + pr_debug("Secure Store , UDC = %s, secure = %d\n", + gi->composite.gadget_driver.udc_name, + gi->secure); + + mutex_lock(&gi->lock); + if (gi->secure) { + ret = usb_gadget_unregister_driver( + &gi->composite.gadget_driver); + if (ret) + pr_err("Failed detaching UDC from gadget %d\n", ret); + } else { + ret = usb_gadget_probe_driver(&gi->composite.gadget_driver); + if (ret) + pr_err("Failed attaching UDC to gadget %d\n", ret); + } + mutex_unlock(&gi->lock); + + return count; +} + +static DEVICE_ATTR(secure, S_IRUGO | S_IWUSR, secure_show, secure_store); + + #ifdef CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE static ssize_t bcdUSB_show(struct device *pdev, struct device_attribute *attr, char *buf) @@ -1969,6 +2029,7 @@ static DEVICE_ATTR(bcdUSB, S_IRUGO, bcdUSB_show, NULL); static struct device_attribute *android_usb_attributes[] = { &dev_attr_state, + &dev_attr_secure, &dev_attr_enable, &dev_attr_functions, #ifdef CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE