Merge 3.3-rc6 into driver-core-next

This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 0955bb8979fb..6e043eeb1db9 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -1704,13 +1704,15 @@ static ssize_t target_core_store_dev_alias(
                 return -EINVAL;
         }
 
-        se_dev->su_dev_flags |= SDF_USING_ALIAS;
         read_bytes = snprintf(&se_dev->se_dev_alias[0], SE_DEV_ALIAS_LEN,
                         "%s", page);
-
+        if (!read_bytes)
+                return -EINVAL;
         if (se_dev->se_dev_alias[read_bytes - 1] == '\n')
                 se_dev->se_dev_alias[read_bytes - 1] = '\0';
 
+        se_dev->su_dev_flags |= SDF_USING_ALIAS;
+
         pr_debug("Target_Core_ConfigFS: %s/%s set alias: %s\n",
                 config_item_name(&hba->hba_group.cg_item),
                 config_item_name(&se_dev->se_dev_group.cg_item),
@@ -1753,13 +1755,15 @@ static ssize_t target_core_store_dev_udev_path(
                 return -EINVAL;
         }
 
-        se_dev->su_dev_flags |= SDF_USING_UDEV_PATH;
         read_bytes = snprintf(&se_dev->se_dev_udev_path[0], SE_UDEV_PATH_LEN,
                         "%s", page);
-
+        if (!read_bytes)
+                return -EINVAL;
         if (se_dev->se_dev_udev_path[read_bytes - 1] == '\n')
                 se_dev->se_dev_udev_path[read_bytes - 1] = '\0';
 
+        se_dev->su_dev_flags |= SDF_USING_UDEV_PATH;
+
         pr_debug("Target_Core_ConfigFS: %s/%s set udev_path: %s\n",
                 config_item_name(&hba->hba_group.cg_item),
                 config_item_name(&se_dev->se_dev_group.cg_item),