Merge "qbt1000: Validate FP app name before qseecom_start_app"

This commit is contained in:
Linux Build Service Account 2017-05-04 08:45:18 -07:00 committed by Gerrit - the friendly Code Review server
commit b1abf6c73c

View file

@ -401,6 +401,13 @@ static long qbt1000_ioctl(struct file *file, unsigned cmd, unsigned long arg)
goto end; goto end;
} }
if (strcmp(app.name, FP_APP_NAME)) {
dev_err(drvdata->dev, "%s: Invalid app name\n",
__func__);
rc = -EINVAL;
goto end;
}
if (drvdata->app_handle) { if (drvdata->app_handle) {
dev_err(drvdata->dev, "%s: LOAD app already loaded, unloading first\n", dev_err(drvdata->dev, "%s: LOAD app already loaded, unloading first\n",
__func__); __func__);
@ -447,9 +454,7 @@ static long qbt1000_ioctl(struct file *file, unsigned cmd, unsigned long arg)
pr_debug("app %s load after\n", app.name); pr_debug("app %s load after\n", app.name);
if (!strcmp(app.name, FP_APP_NAME)) drvdata->fp_app_handle = drvdata->app_handle;
drvdata->fp_app_handle = drvdata->app_handle;
break; break;
} }
case QBT1000_UNLOAD_APP: case QBT1000_UNLOAD_APP: