projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 02607aff GKH |
1 | From 609039b24f41632a5942f8a546a719d2f45009fa Mon Sep 17 00:00:00 2001 |
| 2 | From: Eric Dumazet <dada1@cosmosbay.com> | |
| 3 | Date: Wed, 23 Jul 2008 23:54:35 -0700 | |
| 4 | Subject: raw: Restore /proc/net/raw correct behavior | |
| 5 | ||
| 6 | From: Eric Dumazet <dada1@cosmosbay.com> | |
| 7 | ||
| 8 | [ Upstream commit 68be802cd5ad040fe8cfa33ce3031405df2d9117 ] | |
| 9 | ||
| 10 | I just noticed "cat /proc/net/raw" was buggy, missing '\n' separators. | |
| 11 | ||
| 12 | I believe this was introduced by commit 8cd850efa4948d57a2ed836911cfd1ab299e89c6 | |
| 13 | ([RAW]: Cleanup IPv4 raw_seq_show.) | |
| 14 | ||
| 15 | This trivial patch restores correct behavior, and applies to current | |
| 16 | Linus tree (should also be applied to stable tree as well.) | |
| 17 | ||
| 18 | Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> | |
| 19 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
| 20 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 21 | ||
| 22 | --- | |
| 23 | net/ipv4/raw.c | 2 +- | |
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 25 | ||
| 26 | --- a/net/ipv4/raw.c | |
| 27 | +++ b/net/ipv4/raw.c | |
| 28 | @@ -936,7 +936,7 @@ static void raw_sock_seq_show(struct seq | |
| 29 | srcp = inet->num; | |
| 30 | ||
| 31 | seq_printf(seq, "%4d: %08X:%04X %08X:%04X" | |
| 32 | - " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d", | |
| 33 | + " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d\n", | |
| 34 | i, src, srcp, dest, destp, sp->sk_state, | |
| 35 | atomic_read(&sp->sk_wmem_alloc), | |
| 36 | atomic_read(&sp->sk_rmem_alloc), |