diff options
| author | Petr Mladek <pmladek@suse.com> | 2019-09-16 12:54:25 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2019-09-16 12:54:25 +0200 |
| commit | ae88de56a1893bdccc7b5af8c12556de649d675e (patch) | |
| tree | e3b70d7df5d379c20ac15d9fea3a7642e1f2f3e1 /lib | |
| parent | c9dccacfccc72c32692eedff4a27a4b0833a2afd (diff) | |
| parent | 085a3a8fdf3e2fbd4678dbeccbb656bd328b3715 (diff) | |
Merge branch 'for-5.4' into for-linus
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test_printf.c | 5 | ||||
| -rw-r--r-- | lib/vsprintf.c | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lib/test_printf.c b/lib/test_printf.c index 944eb50f3862..5d94cbff2120 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -455,6 +455,11 @@ dentry(void) test("foo", "%pd", &test_dentry[0]); test("foo", "%pd2", &test_dentry[0]); + test("(null)", "%pd", NULL); + test("(efault)", "%pd", PTR_INVALID); + test("(null)", "%pD", NULL); + test("(efault)", "%pD", PTR_INVALID); + test("romeo", "%pd", &test_dentry[3]); test("alfa/romeo", "%pd2", &test_dentry[3]); test("bravo/alfa/romeo", "%pd3", &test_dentry[3]); diff --git a/lib/vsprintf.c b/lib/vsprintf.c index b0967cf17137..e78017a3e1bd 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -869,6 +869,15 @@ char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp return widen_string(buf, n, end, spec); } +static noinline_for_stack +char *file_dentry_name(char *buf, char *end, const struct file *f, + struct printf_spec spec, const char *fmt) +{ + if (check_pointer(&buf, end, f, spec)) + return buf; + + return dentry_name(buf, end, f->f_path.dentry, spec, fmt); +} #ifdef CONFIG_BLOCK static noinline_for_stack char *bdev_name(char *buf, char *end, struct block_device *bdev, @@ -2166,9 +2175,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, case 'C': return clock(buf, end, ptr, spec, fmt); case 'D': - return dentry_name(buf, end, - ((const struct file *)ptr)->f_path.dentry, - spec, fmt); + return file_dentry_name(buf, end, ptr, spec, fmt); #ifdef CONFIG_BLOCK case 'g': return bdev_name(buf, end, ptr, spec, fmt); |