2008-08-31 17:13:54 +02:00
|
|
|
/*
|
|
|
|
* Helpers for formatting and printing strings
|
|
|
|
*
|
|
|
|
* Copyright 31 August 2008 James Bottomley
|
2013-05-01 00:27:30 +02:00
|
|
|
* Copyright (C) 2013, Intel Corporation
|
2008-08-31 17:13:54 +02:00
|
|
|
*/
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
#include <linux/bug.h>
|
2008-08-31 17:13:54 +02:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/math64.h>
|
2011-11-17 03:29:17 +01:00
|
|
|
#include <linux/export.h>
|
2013-05-01 00:27:30 +02:00
|
|
|
#include <linux/ctype.h>
|
2014-10-14 00:55:16 +02:00
|
|
|
#include <linux/errno.h>
|
2016-04-21 00:46:25 +02:00
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/limits.h>
|
2016-04-21 00:46:24 +02:00
|
|
|
#include <linux/mm.h>
|
2016-04-21 00:46:23 +02:00
|
|
|
#include <linux/slab.h>
|
2014-10-14 00:55:16 +02:00
|
|
|
#include <linux/string.h>
|
2008-08-31 17:13:54 +02:00
|
|
|
#include <linux/string_helpers.h>
|
|
|
|
|
|
|
|
/**
|
|
|
|
* string_get_size - get the size in the specified units
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
* @size: The size to be converted in blocks
|
|
|
|
* @blk_size: Size of the block (use 1 for size in bytes)
|
2008-08-31 17:13:54 +02:00
|
|
|
* @units: units to use (powers of 1000 or 1024)
|
|
|
|
* @buf: buffer to format to
|
|
|
|
* @len: length of buffer
|
|
|
|
*
|
|
|
|
* This function returns a string formatted to 3 significant figures
|
2015-02-13 00:01:50 +01:00
|
|
|
* giving the size in the required units. @buf should have room for
|
|
|
|
* at least 9 bytes and will always be zero terminated.
|
2008-08-31 17:13:54 +02:00
|
|
|
*
|
|
|
|
*/
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
void string_get_size(u64 size, u64 blk_size, const enum string_size_units units,
|
2015-02-13 00:01:50 +01:00
|
|
|
char *buf, int len)
|
2008-08-31 17:13:54 +02:00
|
|
|
{
|
2014-08-07 01:09:31 +02:00
|
|
|
static const char *const units_10[] = {
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"
|
2014-08-07 01:09:31 +02:00
|
|
|
};
|
|
|
|
static const char *const units_2[] = {
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"
|
2014-08-07 01:09:31 +02:00
|
|
|
};
|
|
|
|
static const char *const *const units_str[] = {
|
|
|
|
[STRING_UNITS_10] = units_10,
|
2008-08-31 17:13:54 +02:00
|
|
|
[STRING_UNITS_2] = units_2,
|
|
|
|
};
|
2012-05-30 00:07:32 +02:00
|
|
|
static const unsigned int divisor[] = {
|
2008-08-31 17:13:54 +02:00
|
|
|
[STRING_UNITS_10] = 1000,
|
|
|
|
[STRING_UNITS_2] = 1024,
|
|
|
|
};
|
2016-01-20 23:58:29 +01:00
|
|
|
static const unsigned int rounding[] = { 500, 50, 5 };
|
|
|
|
int i = 0, j;
|
|
|
|
u32 remainder = 0, sf_cap;
|
2008-08-31 17:13:54 +02:00
|
|
|
char tmp[8];
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
const char *unit;
|
2008-08-31 17:13:54 +02:00
|
|
|
|
|
|
|
tmp[0] = '\0';
|
2016-01-20 23:58:29 +01:00
|
|
|
|
|
|
|
if (blk_size == 0)
|
|
|
|
size = 0;
|
|
|
|
if (size == 0)
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
goto out;
|
2008-08-31 17:13:54 +02:00
|
|
|
|
2016-01-20 23:58:29 +01:00
|
|
|
/* This is Napier's algorithm. Reduce the original block size to
|
|
|
|
*
|
|
|
|
* coefficient * divisor[units]^i
|
|
|
|
*
|
|
|
|
* we do the reduction so both coefficients are just under 32 bits so
|
|
|
|
* that multiplying them together won't overflow 64 bits and we keep
|
|
|
|
* as much precision as possible in the numbers.
|
|
|
|
*
|
|
|
|
* Note: it's safe to throw away the remainders here because all the
|
|
|
|
* precision is in the coefficients.
|
|
|
|
*/
|
|
|
|
while (blk_size >> 32) {
|
|
|
|
do_div(blk_size, divisor[units]);
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
2016-01-20 23:58:29 +01:00
|
|
|
while (size >> 32) {
|
|
|
|
do_div(size, divisor[units]);
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
2016-01-20 23:58:29 +01:00
|
|
|
/* now perform the actual multiplication keeping i as the sum of the
|
|
|
|
* two logarithms */
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
size *= blk_size;
|
2008-08-31 17:13:54 +02:00
|
|
|
|
2016-01-20 23:58:29 +01:00
|
|
|
/* and logarithmically reduce it until it's just under the divisor */
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
while (size >= divisor[units]) {
|
|
|
|
remainder = do_div(size, divisor[units]);
|
|
|
|
i++;
|
2008-08-31 17:13:54 +02:00
|
|
|
}
|
|
|
|
|
2016-01-20 23:58:29 +01:00
|
|
|
/* work out in j how many digits of precision we need from the
|
|
|
|
* remainder */
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
sf_cap = size;
|
|
|
|
for (j = 0; sf_cap*10 < 1000; j++)
|
|
|
|
sf_cap *= 10;
|
|
|
|
|
2016-01-20 23:58:29 +01:00
|
|
|
if (units == STRING_UNITS_2) {
|
|
|
|
/* express the remainder as a decimal. It's currently the
|
|
|
|
* numerator of a fraction whose denominator is
|
|
|
|
* divisor[units], which is 1 << 10 for STRING_UNITS_2 */
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
remainder *= 1000;
|
2016-01-20 23:58:29 +01:00
|
|
|
remainder >>= 10;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add a 5 to the digit below what will be printed to ensure
|
|
|
|
* an arithmetical round up and carry it through to size */
|
|
|
|
remainder += rounding[j];
|
|
|
|
if (remainder >= 1000) {
|
|
|
|
remainder -= 1000;
|
|
|
|
size += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (j) {
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
snprintf(tmp, sizeof(tmp), ".%03u", remainder);
|
|
|
|
tmp[j+1] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (i >= ARRAY_SIZE(units_2))
|
|
|
|
unit = "UNK";
|
|
|
|
else
|
|
|
|
unit = units_str[units][i];
|
|
|
|
|
2015-02-13 00:01:48 +01:00
|
|
|
snprintf(buf, len, "%u%s %s", (u32)size,
|
sd, mmc, virtio_blk, string_helpers: fix block size units
The current string_get_size() overflows when the device size goes over
2^64 bytes because the string helper routine computes the suffix from
the size in bytes. However, the entirety of Linux thinks in terms of
blocks, not bytes, so this will artificially induce an overflow on very
large devices. Fix this by making the function string_get_size() take
blocks and the block size instead of bytes. This should allow us to
keep working until the current SCSI standard overflows.
Also fix virtio_blk and mmc (both of which were also artificially
multiplying by the block size to pass a byte side to string_get_size()).
The mathematics of this is pretty simple: we're taking a product of
size in blocks (S) and block size (B) and trying to re-express this in
exponential form: S*B = R*N^E (where N, the exponent is either 1000 or
1024) and R < N. Mathematically, S = RS*N^ES and B=RB*N^EB, so if RS*RB
< N it's easy to see that S*B = RS*RB*N^(ES+EB). However, if RS*BS > N,
we can see that this can be re-expressed as RS*BS = R*N (where R =
RS*BS/N < N) so the whole exponent becomes R*N^(ES+EB+1)
[jejb: fix incorrect 32 bit do_div spotted by kbuild test robot <fengguang.wu@intel.com>]
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
2015-03-06 03:47:01 +01:00
|
|
|
tmp, unit);
|
2008-08-31 17:13:54 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(string_get_size);
|
2013-05-01 00:27:30 +02:00
|
|
|
|
|
|
|
static bool unescape_space(char **src, char **dst)
|
|
|
|
{
|
|
|
|
char *p = *dst, *q = *src;
|
|
|
|
|
|
|
|
switch (*q) {
|
|
|
|
case 'n':
|
|
|
|
*p = '\n';
|
|
|
|
break;
|
|
|
|
case 'r':
|
|
|
|
*p = '\r';
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
*p = '\t';
|
|
|
|
break;
|
|
|
|
case 'v':
|
|
|
|
*p = '\v';
|
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
*p = '\f';
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
*dst += 1;
|
|
|
|
*src += 1;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool unescape_octal(char **src, char **dst)
|
|
|
|
{
|
|
|
|
char *p = *dst, *q = *src;
|
|
|
|
u8 num;
|
|
|
|
|
|
|
|
if (isodigit(*q) == 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
num = (*q++) & 7;
|
|
|
|
while (num < 32 && isodigit(*q) && (q - *src < 3)) {
|
|
|
|
num <<= 3;
|
|
|
|
num += (*q++) & 7;
|
|
|
|
}
|
|
|
|
*p = num;
|
|
|
|
*dst += 1;
|
|
|
|
*src = q;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool unescape_hex(char **src, char **dst)
|
|
|
|
{
|
|
|
|
char *p = *dst, *q = *src;
|
|
|
|
int digit;
|
|
|
|
u8 num;
|
|
|
|
|
|
|
|
if (*q++ != 'x')
|
|
|
|
return false;
|
|
|
|
|
|
|
|
num = digit = hex_to_bin(*q++);
|
|
|
|
if (digit < 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
digit = hex_to_bin(*q);
|
|
|
|
if (digit >= 0) {
|
|
|
|
q++;
|
|
|
|
num = (num << 4) | digit;
|
|
|
|
}
|
|
|
|
*p = num;
|
|
|
|
*dst += 1;
|
|
|
|
*src = q;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool unescape_special(char **src, char **dst)
|
|
|
|
{
|
|
|
|
char *p = *dst, *q = *src;
|
|
|
|
|
|
|
|
switch (*q) {
|
|
|
|
case '\"':
|
|
|
|
*p = '\"';
|
|
|
|
break;
|
|
|
|
case '\\':
|
|
|
|
*p = '\\';
|
|
|
|
break;
|
|
|
|
case 'a':
|
|
|
|
*p = '\a';
|
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
*p = '\e';
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
*dst += 1;
|
|
|
|
*src += 1;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-10-14 00:55:11 +02:00
|
|
|
/**
|
|
|
|
* string_unescape - unquote characters in the given string
|
|
|
|
* @src: source buffer (escaped)
|
|
|
|
* @dst: destination buffer (unescaped)
|
|
|
|
* @size: size of the destination buffer (0 to unlimit)
|
|
|
|
* @flags: combination of the flags (bitwise OR):
|
|
|
|
* %UNESCAPE_SPACE:
|
|
|
|
* '\f' - form feed
|
|
|
|
* '\n' - new line
|
|
|
|
* '\r' - carriage return
|
|
|
|
* '\t' - horizontal tab
|
|
|
|
* '\v' - vertical tab
|
|
|
|
* %UNESCAPE_OCTAL:
|
|
|
|
* '\NNN' - byte with octal value NNN (1 to 3 digits)
|
|
|
|
* %UNESCAPE_HEX:
|
|
|
|
* '\xHH' - byte with hexadecimal value HH (1 to 2 digits)
|
|
|
|
* %UNESCAPE_SPECIAL:
|
|
|
|
* '\"' - double quote
|
|
|
|
* '\\' - backslash
|
|
|
|
* '\a' - alert (BEL)
|
|
|
|
* '\e' - escape
|
|
|
|
* %UNESCAPE_ANY:
|
|
|
|
* all previous together
|
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* The function unquotes characters in the given string.
|
|
|
|
*
|
|
|
|
* Because the size of the output will be the same as or less than the size of
|
|
|
|
* the input, the transformation may be performed in place.
|
|
|
|
*
|
|
|
|
* Caller must provide valid source and destination pointers. Be aware that
|
|
|
|
* destination buffer will always be NULL-terminated. Source string must be
|
|
|
|
* NULL-terminated as well.
|
|
|
|
*
|
|
|
|
* Return:
|
|
|
|
* The amount of the characters processed to the destination buffer excluding
|
|
|
|
* trailing '\0' is returned.
|
|
|
|
*/
|
2013-05-01 00:27:30 +02:00
|
|
|
int string_unescape(char *src, char *dst, size_t size, unsigned int flags)
|
|
|
|
{
|
|
|
|
char *out = dst;
|
|
|
|
|
|
|
|
while (*src && --size) {
|
|
|
|
if (src[0] == '\\' && src[1] != '\0' && size > 1) {
|
|
|
|
src++;
|
|
|
|
size--;
|
|
|
|
|
|
|
|
if (flags & UNESCAPE_SPACE &&
|
|
|
|
unescape_space(&src, &out))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (flags & UNESCAPE_OCTAL &&
|
|
|
|
unescape_octal(&src, &out))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (flags & UNESCAPE_HEX &&
|
|
|
|
unescape_hex(&src, &out))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (flags & UNESCAPE_SPECIAL &&
|
|
|
|
unescape_special(&src, &out))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
*out++ = '\\';
|
|
|
|
}
|
|
|
|
*out++ = *src++;
|
|
|
|
}
|
|
|
|
*out = '\0';
|
|
|
|
|
|
|
|
return out - dst;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(string_unescape);
|
2014-10-14 00:55:16 +02:00
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
static bool escape_passthrough(unsigned char c, char **dst, char *end)
|
2014-10-14 00:55:16 +02:00
|
|
|
{
|
|
|
|
char *out = *dst;
|
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
if (out < end)
|
|
|
|
*out = c;
|
|
|
|
*dst = out + 1;
|
|
|
|
return true;
|
2014-10-14 00:55:16 +02:00
|
|
|
}
|
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
static bool escape_space(unsigned char c, char **dst, char *end)
|
2014-10-14 00:55:16 +02:00
|
|
|
{
|
|
|
|
char *out = *dst;
|
|
|
|
unsigned char to;
|
|
|
|
|
|
|
|
switch (c) {
|
|
|
|
case '\n':
|
|
|
|
to = 'n';
|
|
|
|
break;
|
|
|
|
case '\r':
|
|
|
|
to = 'r';
|
|
|
|
break;
|
|
|
|
case '\t':
|
|
|
|
to = 't';
|
|
|
|
break;
|
|
|
|
case '\v':
|
|
|
|
to = 'v';
|
|
|
|
break;
|
|
|
|
case '\f':
|
|
|
|
to = 'f';
|
|
|
|
break;
|
|
|
|
default:
|
2015-04-16 01:17:25 +02:00
|
|
|
return false;
|
2014-10-14 00:55:16 +02:00
|
|
|
}
|
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
if (out < end)
|
|
|
|
*out = '\\';
|
|
|
|
++out;
|
|
|
|
if (out < end)
|
|
|
|
*out = to;
|
|
|
|
++out;
|
2014-10-14 00:55:16 +02:00
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
*dst = out;
|
|
|
|
return true;
|
2014-10-14 00:55:16 +02:00
|
|
|
}
|
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
static bool escape_special(unsigned char c, char **dst, char *end)
|
2014-10-14 00:55:16 +02:00
|
|
|
{
|
|
|
|
char *out = *dst;
|
|
|
|
unsigned char to;
|
|
|
|
|
|
|
|
switch (c) {
|
|
|
|
case '\\':
|
|
|
|
to = '\\';
|
|
|
|
break;
|
|
|
|
case '\a':
|
|
|
|
to = 'a';
|
|
|
|
break;
|
|
|
|
case '\e':
|
|
|
|
to = 'e';
|
|
|
|
break;
|
|
|
|
default:
|
2015-04-16 01:17:25 +02:00
|
|
|
return false;
|
2014-10-14 00:55:16 +02:00
|
|
|
}
|
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
if (out < end)
|
|
|
|
*out = '\\';
|
|
|
|
++out;
|
|
|
|
if (out < end)
|
|
|
|
*out = to;
|
|
|
|
++out;
|
2014-10-14 00:55:16 +02:00
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
*dst = out;
|
|
|
|
return true;
|
2014-10-14 00:55:16 +02:00
|
|
|
}
|
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
static bool escape_null(unsigned char c, char **dst, char *end)
|
2014-10-14 00:55:16 +02:00
|
|
|
{
|
|
|
|
char *out = *dst;
|
|
|
|
|
|
|
|
if (c)
|
2015-04-16 01:17:25 +02:00
|
|
|
return false;
|
2014-10-14 00:55:16 +02:00
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
if (out < end)
|
|
|
|
*out = '\\';
|
|
|
|
++out;
|
|
|
|
if (out < end)
|
|
|
|
*out = '0';
|
|
|
|
++out;
|
2014-10-14 00:55:16 +02:00
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
*dst = out;
|
|
|
|
return true;
|
2014-10-14 00:55:16 +02:00
|
|
|
}
|
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
static bool escape_octal(unsigned char c, char **dst, char *end)
|
2014-10-14 00:55:16 +02:00
|
|
|
{
|
|
|
|
char *out = *dst;
|
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
if (out < end)
|
|
|
|
*out = '\\';
|
|
|
|
++out;
|
|
|
|
if (out < end)
|
|
|
|
*out = ((c >> 6) & 0x07) + '0';
|
|
|
|
++out;
|
|
|
|
if (out < end)
|
|
|
|
*out = ((c >> 3) & 0x07) + '0';
|
|
|
|
++out;
|
|
|
|
if (out < end)
|
|
|
|
*out = ((c >> 0) & 0x07) + '0';
|
|
|
|
++out;
|
2014-10-14 00:55:16 +02:00
|
|
|
|
|
|
|
*dst = out;
|
2015-04-16 01:17:25 +02:00
|
|
|
return true;
|
2014-10-14 00:55:16 +02:00
|
|
|
}
|
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
static bool escape_hex(unsigned char c, char **dst, char *end)
|
2014-10-14 00:55:16 +02:00
|
|
|
{
|
|
|
|
char *out = *dst;
|
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
if (out < end)
|
|
|
|
*out = '\\';
|
|
|
|
++out;
|
|
|
|
if (out < end)
|
|
|
|
*out = 'x';
|
|
|
|
++out;
|
|
|
|
if (out < end)
|
|
|
|
*out = hex_asc_hi(c);
|
|
|
|
++out;
|
|
|
|
if (out < end)
|
|
|
|
*out = hex_asc_lo(c);
|
|
|
|
++out;
|
2014-10-14 00:55:16 +02:00
|
|
|
|
|
|
|
*dst = out;
|
2015-04-16 01:17:25 +02:00
|
|
|
return true;
|
2014-10-14 00:55:16 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* string_escape_mem - quote characters in the given memory buffer
|
|
|
|
* @src: source buffer (unescaped)
|
|
|
|
* @isz: source buffer size
|
|
|
|
* @dst: destination buffer (escaped)
|
|
|
|
* @osz: destination buffer size
|
|
|
|
* @flags: combination of the flags (bitwise OR):
|
2015-09-10 00:37:14 +02:00
|
|
|
* %ESCAPE_SPACE: (special white space, not space itself)
|
2014-10-14 00:55:16 +02:00
|
|
|
* '\f' - form feed
|
|
|
|
* '\n' - new line
|
|
|
|
* '\r' - carriage return
|
|
|
|
* '\t' - horizontal tab
|
|
|
|
* '\v' - vertical tab
|
|
|
|
* %ESCAPE_SPECIAL:
|
|
|
|
* '\\' - backslash
|
|
|
|
* '\a' - alert (BEL)
|
|
|
|
* '\e' - escape
|
|
|
|
* %ESCAPE_NULL:
|
|
|
|
* '\0' - null
|
|
|
|
* %ESCAPE_OCTAL:
|
|
|
|
* '\NNN' - byte with octal value NNN (3 digits)
|
|
|
|
* %ESCAPE_ANY:
|
|
|
|
* all previous together
|
|
|
|
* %ESCAPE_NP:
|
|
|
|
* escape only non-printable characters (checked by isprint)
|
|
|
|
* %ESCAPE_ANY_NP:
|
|
|
|
* all previous together
|
|
|
|
* %ESCAPE_HEX:
|
|
|
|
* '\xHH' - byte with hexadecimal value HH (2 digits)
|
2015-09-10 00:37:16 +02:00
|
|
|
* @only: NULL-terminated string containing characters used to limit
|
|
|
|
* the selected escape class. If characters are included in @only
|
2015-09-10 00:37:14 +02:00
|
|
|
* that would not normally be escaped by the classes selected
|
|
|
|
* in @flags, they will be copied to @dst unescaped.
|
2014-10-14 00:55:16 +02:00
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* The process of escaping byte buffer includes several parts. They are applied
|
|
|
|
* in the following sequence.
|
|
|
|
* 1. The character is matched to the printable class, if asked, and in
|
|
|
|
* case of match it passes through to the output.
|
2015-09-10 00:37:16 +02:00
|
|
|
* 2. The character is not matched to the one from @only string and thus
|
2015-09-10 00:37:14 +02:00
|
|
|
* must go as-is to the output.
|
2014-10-14 00:55:16 +02:00
|
|
|
* 3. The character is checked if it falls into the class given by @flags.
|
|
|
|
* %ESCAPE_OCTAL and %ESCAPE_HEX are going last since they cover any
|
|
|
|
* character. Note that they actually can't go together, otherwise
|
|
|
|
* %ESCAPE_HEX will be ignored.
|
|
|
|
*
|
|
|
|
* Caller must provide valid source and destination pointers. Be aware that
|
|
|
|
* destination buffer will not be NULL-terminated, thus caller have to append
|
|
|
|
* it if needs.
|
|
|
|
*
|
|
|
|
* Return:
|
lib/string_helpers.c: change semantics of string_escape_mem
The current semantics of string_escape_mem are inadequate for one of its
current users, vsnprintf(). If that is to honour its contract, it must
know how much space would be needed for the entire escaped buffer, and
string_escape_mem provides no way of obtaining that (short of allocating a
large enough buffer (~4 times input string) to let it play with, and
that's definitely a big no-no inside vsnprintf).
So change the semantics for string_escape_mem to be more snprintf-like:
Return the size of the output that would be generated if the destination
buffer was big enough, but of course still only write to the part of dst
it is allowed to, and (contrary to snprintf) don't do '\0'-termination.
It is then up to the caller to detect whether output was truncated and to
append a '\0' if desired. Also, we must output partial escape sequences,
otherwise a call such as snprintf(buf, 3, "%1pE", "\123") would cause
printf to write a \0 to buf[2] but leaving buf[0] and buf[1] with whatever
they previously contained.
This also fixes a bug in the escaped_string() helper function, which used
to unconditionally pass a length of "end-buf" to string_escape_mem();
since the latter doesn't check osz for being insanely large, it would
happily write to dst. For example, kasprintf(GFP_KERNEL, "something and
then %pE", ...); is an easy way to trigger an oops.
In test-string_helpers.c, the -ENOMEM test is replaced with testing for
getting the expected return value even if the buffer is too small. We
also ensure that nothing is written (by relying on a NULL pointer deref)
if the output size is 0 by passing NULL - this has to work for
kasprintf("%pE") to work.
In net/sunrpc/cache.c, I think qword_add still has the same semantics.
Someone should definitely double-check this.
In fs/proc/array.c, I made the minimum possible change, but longer-term it
should stop poking around in seq_file internals.
[andriy.shevchenko@linux.intel.com: simplify qword_add]
[andriy.shevchenko@linux.intel.com: add missed curly braces]
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-04-16 01:17:28 +02:00
|
|
|
* The total size of the escaped output that would be generated for
|
|
|
|
* the given input and flags. To check whether the output was
|
|
|
|
* truncated, compare the return value to osz. There is room left in
|
|
|
|
* dst for a '\0' terminator if and only if ret < osz.
|
2014-10-14 00:55:16 +02:00
|
|
|
*/
|
lib/string_helpers.c: change semantics of string_escape_mem
The current semantics of string_escape_mem are inadequate for one of its
current users, vsnprintf(). If that is to honour its contract, it must
know how much space would be needed for the entire escaped buffer, and
string_escape_mem provides no way of obtaining that (short of allocating a
large enough buffer (~4 times input string) to let it play with, and
that's definitely a big no-no inside vsnprintf).
So change the semantics for string_escape_mem to be more snprintf-like:
Return the size of the output that would be generated if the destination
buffer was big enough, but of course still only write to the part of dst
it is allowed to, and (contrary to snprintf) don't do '\0'-termination.
It is then up to the caller to detect whether output was truncated and to
append a '\0' if desired. Also, we must output partial escape sequences,
otherwise a call such as snprintf(buf, 3, "%1pE", "\123") would cause
printf to write a \0 to buf[2] but leaving buf[0] and buf[1] with whatever
they previously contained.
This also fixes a bug in the escaped_string() helper function, which used
to unconditionally pass a length of "end-buf" to string_escape_mem();
since the latter doesn't check osz for being insanely large, it would
happily write to dst. For example, kasprintf(GFP_KERNEL, "something and
then %pE", ...); is an easy way to trigger an oops.
In test-string_helpers.c, the -ENOMEM test is replaced with testing for
getting the expected return value even if the buffer is too small. We
also ensure that nothing is written (by relying on a NULL pointer deref)
if the output size is 0 by passing NULL - this has to work for
kasprintf("%pE") to work.
In net/sunrpc/cache.c, I think qword_add still has the same semantics.
Someone should definitely double-check this.
In fs/proc/array.c, I made the minimum possible change, but longer-term it
should stop poking around in seq_file internals.
[andriy.shevchenko@linux.intel.com: simplify qword_add]
[andriy.shevchenko@linux.intel.com: add missed curly braces]
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-04-16 01:17:28 +02:00
|
|
|
int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,
|
2015-09-10 00:37:16 +02:00
|
|
|
unsigned int flags, const char *only)
|
2014-10-14 00:55:16 +02:00
|
|
|
{
|
lib/string_helpers.c: change semantics of string_escape_mem
The current semantics of string_escape_mem are inadequate for one of its
current users, vsnprintf(). If that is to honour its contract, it must
know how much space would be needed for the entire escaped buffer, and
string_escape_mem provides no way of obtaining that (short of allocating a
large enough buffer (~4 times input string) to let it play with, and
that's definitely a big no-no inside vsnprintf).
So change the semantics for string_escape_mem to be more snprintf-like:
Return the size of the output that would be generated if the destination
buffer was big enough, but of course still only write to the part of dst
it is allowed to, and (contrary to snprintf) don't do '\0'-termination.
It is then up to the caller to detect whether output was truncated and to
append a '\0' if desired. Also, we must output partial escape sequences,
otherwise a call such as snprintf(buf, 3, "%1pE", "\123") would cause
printf to write a \0 to buf[2] but leaving buf[0] and buf[1] with whatever
they previously contained.
This also fixes a bug in the escaped_string() helper function, which used
to unconditionally pass a length of "end-buf" to string_escape_mem();
since the latter doesn't check osz for being insanely large, it would
happily write to dst. For example, kasprintf(GFP_KERNEL, "something and
then %pE", ...); is an easy way to trigger an oops.
In test-string_helpers.c, the -ENOMEM test is replaced with testing for
getting the expected return value even if the buffer is too small. We
also ensure that nothing is written (by relying on a NULL pointer deref)
if the output size is 0 by passing NULL - this has to work for
kasprintf("%pE") to work.
In net/sunrpc/cache.c, I think qword_add still has the same semantics.
Someone should definitely double-check this.
In fs/proc/array.c, I made the minimum possible change, but longer-term it
should stop poking around in seq_file internals.
[andriy.shevchenko@linux.intel.com: simplify qword_add]
[andriy.shevchenko@linux.intel.com: add missed curly braces]
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-04-16 01:17:28 +02:00
|
|
|
char *p = dst;
|
2015-04-16 01:17:25 +02:00
|
|
|
char *end = p + osz;
|
2015-09-10 00:37:16 +02:00
|
|
|
bool is_dict = only && *only;
|
2014-10-14 00:55:16 +02:00
|
|
|
|
|
|
|
while (isz--) {
|
|
|
|
unsigned char c = *src++;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Apply rules in the following sequence:
|
|
|
|
* - the character is printable, when @flags has
|
|
|
|
* %ESCAPE_NP bit set
|
2015-09-10 00:37:16 +02:00
|
|
|
* - the @only string is supplied and does not contain a
|
2014-10-14 00:55:16 +02:00
|
|
|
* character under question
|
|
|
|
* - the character doesn't fall into a class of symbols
|
|
|
|
* defined by given @flags
|
|
|
|
* In these cases we just pass through a character to the
|
|
|
|
* output buffer.
|
|
|
|
*/
|
|
|
|
if ((flags & ESCAPE_NP && isprint(c)) ||
|
2015-09-10 00:37:16 +02:00
|
|
|
(is_dict && !strchr(only, c))) {
|
2014-10-14 00:55:16 +02:00
|
|
|
/* do nothing */
|
|
|
|
} else {
|
2015-04-16 01:17:25 +02:00
|
|
|
if (flags & ESCAPE_SPACE && escape_space(c, &p, end))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (flags & ESCAPE_SPECIAL && escape_special(c, &p, end))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (flags & ESCAPE_NULL && escape_null(c, &p, end))
|
|
|
|
continue;
|
2014-10-14 00:55:16 +02:00
|
|
|
|
|
|
|
/* ESCAPE_OCTAL and ESCAPE_HEX always go last */
|
2015-04-16 01:17:25 +02:00
|
|
|
if (flags & ESCAPE_OCTAL && escape_octal(c, &p, end))
|
2014-10-14 00:55:16 +02:00
|
|
|
continue;
|
2015-04-16 01:17:25 +02:00
|
|
|
|
|
|
|
if (flags & ESCAPE_HEX && escape_hex(c, &p, end))
|
2014-10-14 00:55:16 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2015-04-16 01:17:25 +02:00
|
|
|
escape_passthrough(c, &p, end);
|
2014-10-14 00:55:16 +02:00
|
|
|
}
|
|
|
|
|
lib/string_helpers.c: change semantics of string_escape_mem
The current semantics of string_escape_mem are inadequate for one of its
current users, vsnprintf(). If that is to honour its contract, it must
know how much space would be needed for the entire escaped buffer, and
string_escape_mem provides no way of obtaining that (short of allocating a
large enough buffer (~4 times input string) to let it play with, and
that's definitely a big no-no inside vsnprintf).
So change the semantics for string_escape_mem to be more snprintf-like:
Return the size of the output that would be generated if the destination
buffer was big enough, but of course still only write to the part of dst
it is allowed to, and (contrary to snprintf) don't do '\0'-termination.
It is then up to the caller to detect whether output was truncated and to
append a '\0' if desired. Also, we must output partial escape sequences,
otherwise a call such as snprintf(buf, 3, "%1pE", "\123") would cause
printf to write a \0 to buf[2] but leaving buf[0] and buf[1] with whatever
they previously contained.
This also fixes a bug in the escaped_string() helper function, which used
to unconditionally pass a length of "end-buf" to string_escape_mem();
since the latter doesn't check osz for being insanely large, it would
happily write to dst. For example, kasprintf(GFP_KERNEL, "something and
then %pE", ...); is an easy way to trigger an oops.
In test-string_helpers.c, the -ENOMEM test is replaced with testing for
getting the expected return value even if the buffer is too small. We
also ensure that nothing is written (by relying on a NULL pointer deref)
if the output size is 0 by passing NULL - this has to work for
kasprintf("%pE") to work.
In net/sunrpc/cache.c, I think qword_add still has the same semantics.
Someone should definitely double-check this.
In fs/proc/array.c, I made the minimum possible change, but longer-term it
should stop poking around in seq_file internals.
[andriy.shevchenko@linux.intel.com: simplify qword_add]
[andriy.shevchenko@linux.intel.com: add missed curly braces]
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-04-16 01:17:28 +02:00
|
|
|
return p - dst;
|
2014-10-14 00:55:16 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(string_escape_mem);
|
2016-04-21 00:46:23 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Return an allocated string that has been escaped of special characters
|
|
|
|
* and double quotes, making it safe to log in quotes.
|
|
|
|
*/
|
|
|
|
char *kstrdup_quotable(const char *src, gfp_t gfp)
|
|
|
|
{
|
|
|
|
size_t slen, dlen;
|
|
|
|
char *dst;
|
|
|
|
const int flags = ESCAPE_HEX;
|
|
|
|
const char esc[] = "\f\n\r\t\v\a\e\\\"";
|
|
|
|
|
|
|
|
if (!src)
|
|
|
|
return NULL;
|
|
|
|
slen = strlen(src);
|
|
|
|
|
|
|
|
dlen = string_escape_mem(src, slen, NULL, 0, flags, esc);
|
|
|
|
dst = kmalloc(dlen + 1, gfp);
|
|
|
|
if (!dst)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
WARN_ON(string_escape_mem(src, slen, dst, dlen, flags, esc) != dlen);
|
|
|
|
dst[dlen] = '\0';
|
|
|
|
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(kstrdup_quotable);
|
2016-04-21 00:46:24 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Returns allocated NULL-terminated string containing process
|
|
|
|
* command line, with inter-argument NULLs replaced with spaces,
|
|
|
|
* and other special characters escaped.
|
|
|
|
*/
|
|
|
|
char *kstrdup_quotable_cmdline(struct task_struct *task, gfp_t gfp)
|
|
|
|
{
|
|
|
|
char *buffer, *quoted;
|
|
|
|
int i, res;
|
|
|
|
|
|
|
|
buffer = kmalloc(PAGE_SIZE, GFP_TEMPORARY);
|
|
|
|
if (!buffer)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
res = get_cmdline(task, buffer, PAGE_SIZE - 1);
|
|
|
|
buffer[res] = '\0';
|
|
|
|
|
|
|
|
/* Collapse trailing NULLs, leave res pointing to last non-NULL. */
|
|
|
|
while (--res >= 0 && buffer[res] == '\0')
|
|
|
|
;
|
|
|
|
|
|
|
|
/* Replace inter-argument NULLs. */
|
|
|
|
for (i = 0; i <= res; i++)
|
|
|
|
if (buffer[i] == '\0')
|
|
|
|
buffer[i] = ' ';
|
|
|
|
|
|
|
|
/* Make sure result is printable. */
|
|
|
|
quoted = kstrdup_quotable(buffer, gfp);
|
|
|
|
kfree(buffer);
|
|
|
|
return quoted;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(kstrdup_quotable_cmdline);
|
2016-04-21 00:46:25 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Returns allocated NULL-terminated string containing pathname,
|
|
|
|
* with special characters escaped, able to be safely logged. If
|
|
|
|
* there is an error, the leading character will be "<".
|
|
|
|
*/
|
|
|
|
char *kstrdup_quotable_file(struct file *file, gfp_t gfp)
|
|
|
|
{
|
|
|
|
char *temp, *pathname;
|
|
|
|
|
|
|
|
if (!file)
|
|
|
|
return kstrdup("<unknown>", gfp);
|
|
|
|
|
|
|
|
/* We add 11 spaces for ' (deleted)' to be appended */
|
|
|
|
temp = kmalloc(PATH_MAX + 11, GFP_TEMPORARY);
|
|
|
|
if (!temp)
|
|
|
|
return kstrdup("<no_memory>", gfp);
|
|
|
|
|
|
|
|
pathname = file_path(file, temp, PATH_MAX + 11);
|
|
|
|
if (IS_ERR(pathname))
|
|
|
|
pathname = kstrdup("<too_long>", gfp);
|
|
|
|
else
|
|
|
|
pathname = kstrdup_quotable(pathname, gfp);
|
|
|
|
|
|
|
|
kfree(temp);
|
|
|
|
return pathname;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(kstrdup_quotable_file);
|