Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus

1 files changed, 2 insertions, 2 deletions

diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index 1b4bc691d7d1..4a1d640b0cf1 100644
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -73,10 +73,10 @@ static int tcf_simp_release(struct tcf_defact *d, int bind)
 
 static int alloc_defdata(struct tcf_defact *d, char *defdata)
 {
-        d->tcfd_defdata = kstrndup(defdata, SIMP_MAX_DATA, GFP_KERNEL);
+        d->tcfd_defdata = kzalloc(SIMP_MAX_DATA, GFP_KERNEL);
         if (unlikely(!d->tcfd_defdata))
                 return -ENOMEM;
-
+        strlcpy(d->tcfd_defdata, defdata, SIMP_MAX_DATA);
         return 0;
 }