diff options
author | 2018-04-25 10:41:08 +0200 | |
---|---|---|
committer | 2018-04-25 16:44:36 +0200 | |
commit | 4d31c6e41ed2f95f97a19766812797dabd82a5ee (patch) | |
tree | e1f81f4f0108ff86f85b8e17b025b21609aec7b2 /drivers/isdn/mISDN/dsp_hwec.c | |
parent | ALSA: hda - Sanity check of access to SPDIF controls array (diff) | |
parent | ALSA: hda - Skip jack and others for non-existing PCM streams (diff) | |
download | linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.tar.gz linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.tar.bz2 linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.zip |
Merge branch 'for-linus' into for-next
Back-merge 4.17-rc3 fixes for further development.
This will bump the base to 4.17-rc2, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/isdn/mISDN/dsp_hwec.c')
-rw-r--r-- | drivers/isdn/mISDN/dsp_hwec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/isdn/mISDN/dsp_hwec.c b/drivers/isdn/mISDN/dsp_hwec.c index a6e87076acc2..5336bbdbfdc5 100644 --- a/drivers/isdn/mISDN/dsp_hwec.c +++ b/drivers/isdn/mISDN/dsp_hwec.c @@ -68,12 +68,12 @@ void dsp_hwec_enable(struct dsp *dsp, const char *arg) goto _do; { - char _dup[len + 1]; char *dup, *tok, *name, *val; int tmp; - strcpy(_dup, arg); - dup = _dup; + dup = kstrdup(arg, GFP_ATOMIC); + if (!dup) + return; while ((tok = strsep(&dup, ","))) { if (!strlen(tok)) @@ -89,6 +89,8 @@ void dsp_hwec_enable(struct dsp *dsp, const char *arg) deftaps = tmp; } } + + kfree(dup); } _do: |