diff options
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 8 | 
1 files changed, 3 insertions, 5 deletions
| diff --git a/kernel/cgroup.c b/kernel/cgroup.c index ca83b73fba19..0249f4be9b5c 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -1710,14 +1710,13 @@ static ssize_t cgroup_write_X64(struct cgroup *cgrp, struct cftype *cft, | |||
| 1710 | return -EFAULT; | 1710 | return -EFAULT; | 
| 1711 | 1711 | ||
| 1712 | buffer[nbytes] = 0; /* nul-terminate */ | 1712 | buffer[nbytes] = 0; /* nul-terminate */ | 
| 1713 | strstrip(buffer); | ||
| 1714 | if (cft->write_u64) { | 1713 | if (cft->write_u64) { | 
| 1715 | u64 val = simple_strtoull(buffer, &end, 0); | 1714 | u64 val = simple_strtoull(strstrip(buffer), &end, 0); | 
| 1716 | if (*end) | 1715 | if (*end) | 
| 1717 | return -EINVAL; | 1716 | return -EINVAL; | 
| 1718 | retval = cft->write_u64(cgrp, cft, val); | 1717 | retval = cft->write_u64(cgrp, cft, val); | 
| 1719 | } else { | 1718 | } else { | 
| 1720 | s64 val = simple_strtoll(buffer, &end, 0); | 1719 | s64 val = simple_strtoll(strstrip(buffer), &end, 0); | 
| 1721 | if (*end) | 1720 | if (*end) | 
| 1722 | return -EINVAL; | 1721 | return -EINVAL; | 
| 1723 | retval = cft->write_s64(cgrp, cft, val); | 1722 | retval = cft->write_s64(cgrp, cft, val); | 
| @@ -1753,8 +1752,7 @@ static ssize_t cgroup_write_string(struct cgroup *cgrp, struct cftype *cft, | |||
| 1753 | } | 1752 | } | 
| 1754 | 1753 | ||
| 1755 | buffer[nbytes] = 0; /* nul-terminate */ | 1754 | buffer[nbytes] = 0; /* nul-terminate */ | 
| 1756 | strstrip(buffer); | 1755 | retval = cft->write_string(cgrp, cft, strstrip(buffer)); | 
| 1757 | retval = cft->write_string(cgrp, cft, buffer); | ||
| 1758 | if (!retval) | 1756 | if (!retval) | 
| 1759 | retval = nbytes; | 1757 | retval = nbytes; | 
| 1760 | out: | 1758 | out: | 
