diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-04-17 12:07:06 -0700 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-03 18:57:59 +0200 |
| commit | 83ac739999158c898e4d9b5df3f18d3f1e6cd404 (patch) | |
| tree | f1c5df03b4aab9afdb456b98dbd25f2fabab7a86 /net/llc/af_llc.c | |
| parent | a548071e06e8d105dbaa2a1066c2a5e45878725d (diff) | |
KEYS: DNS: limit the length of option strings
commit 9c438d7a3a52dcc2b9ed095cb87d3a5e83cf7e60 upstream.
Adding a dns_resolver key whose payload contains a very long option name
resulted in that string being printed in full. This hit the WARN_ONCE()
in set_precision() during the printk(), because printk() only supports a
precision of up to 32767 bytes:
precision 1000000 too large
WARNING: CPU: 0 PID: 752 at lib/vsprintf.c:2189 vsnprintf+0x4bc/0x5b0
Fix it by limiting option strings (combined name + value) to a much more
reasonable 128 bytes. The exact limit is arbitrary, but currently the
only recognized option is formatted as "dnserror=%lu" which fits well
within this limit.
Also ratelimit the printks.
Reproducer:
perl -e 'print "#", "A" x 1000000, "\x00"' | keyctl padd dns_resolver desc @s
This bug was found using syzkaller.
Change-Id: I5e22ee8ad8da3cc222e35239f05591c893d3f508
Reported-by: Mark Rutland <mark.rutland@arm.com>
Fixes: 4a2d789267e0 ("DNS: If the DNS server returns an error, allow that to be cached [ver #2]")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16:
- Also stop logging the key serial number
- Include <linux/ratelimit.h> directly]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/llc/af_llc.c')
0 files changed, 0 insertions, 0 deletions
