From: Marek Lindner Date: Wed, 18 Apr 2012 09:16:39 +0000 (+0800) Subject: batman-adv: ignore trailing CR when comparing protocol names X-Git-Tag: v5.15~21999^2~521^2~12 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d8cb548616524e10d36b4241b03893a11655ec5d;p=mirror_ubuntu-kernels.git batman-adv: ignore trailing CR when comparing protocol names Signed-off-by: Marek Lindner Signed-off-by: Sven Eckelmann --- diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 65b4f0824e4f..8610b5caa178 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -381,14 +381,19 @@ int bat_algo_seq_print_text(struct seq_file *seq, void *offset) static int param_set_ra(const char *val, const struct kernel_param *kp) { struct bat_algo_ops *bat_algo_ops; + char *algo_name = (char *)val; + size_t name_len = strlen(algo_name); - bat_algo_ops = bat_algo_get((char *)val); + if (algo_name[name_len - 1] == '\n') + algo_name[name_len - 1] = '\0'; + + bat_algo_ops = bat_algo_get(algo_name); if (!bat_algo_ops) { - pr_err("Routing algorithm '%s' is not supported\n", val); + pr_err("Routing algorithm '%s' is not supported\n", algo_name); return -EINVAL; } - return param_set_copystring(val, kp); + return param_set_copystring(algo_name, kp); } static const struct kernel_param_ops param_ops_ra = {