@@ -216,16 +216,25 @@ static ssize_t jobid_var_store(struct kobject *kobj, struct attribute *attr,
const char *buffer,
size_t count)
{
+ static char *valid[] = {
+ JOBSTATS_DISABLE,
+ JOBSTATS_PROCNAME_UID,
+ JOBSTATS_NODELOCAL,
+ NULL
+ };
+ int i;
+
if (!count || count > JOBSTATS_JOBID_VAR_MAX_LEN)
return -EINVAL;
- memset(obd_jobid_var, 0, JOBSTATS_JOBID_VAR_MAX_LEN + 1);
-
- memcpy(obd_jobid_var, buffer, count);
+ for (i = 0; valid[i]; i++)
+ if (sysfs_streq(buffer, valid[i]))
+ break;
+ if (!valid[i])
+ return -EINVAL;
- /* Trim the trailing '\n' if any */
- if (obd_jobid_var[count - 1] == '\n')
- obd_jobid_var[count - 1] = 0;
+ memset(obd_jobid_var, 0, JOBSTATS_JOBID_VAR_MAX_LEN + 1);
+ strcpy(obd_jobid_var, valid[i]);
return count;
}
The jobid_var sysfs attribute only has 3 meaningful values. Other values cause lustre_get_jobid() to return an error which is uniformly ignored. To improve usability and resilience, check that the value written is acceptable before storing it. Signed-off-by: NeilBrown <neilb@suse.com> --- drivers/staging/lustre/lustre/obdclass/obd_sysfs.c | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)