Unverified Commit a79afed1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12051 um: line: always fill *error_out in setup_one_line() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tong Tiangen <tongtiangen@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6LTC7X4V2EGZQ57XXPH65UFFKA4NLH3U/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAU9NH 
 
Link:https://gitee.com/openeuler/kernel/pulls/12051

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents e826278e 083ac285

arch/um/drivers/line.c

+2 −0
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ int setup_one_line(struct line *lines, int n, char *init, 
			parse_chan_pair(NULL, line, n, opts, error_out);

			err = 0;

		}

		*error_out = "configured as 'none'";

	} else {

		char *new = kstrdup(init, GFP_KERNEL);

		if (!new) {
@@ -406,6 +407,7 @@ int setup_one_line(struct line *lines, int n, char *init, 
			}

		}

		if (err) {

			*error_out = "failed to parse channel pair";

			line->init_str = NULL;

			line->valid = 0;

			kfree(new);