From 0454ff6a1bd770b56b1eb83698c08775ccbc1ef3 Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Sun, 14 Nov 2010 07:06:08 +0000 Subject: [PATCH] --- yaml --- r: 224433 b: refs/heads/master c: dda0b38692a7298f433b92b1329867b1ecabb4bb h: refs/heads/master i: 224431: 9bd8045b609ed4e34c06b79f032f793c5a620689 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_probe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5e2399463c2b..203fa545c727 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ea19481db31d614f729f346bdcf28e4e60ff14a +refs/heads/master: dda0b38692a7298f433b92b1329867b1ecabb4bb diff --git a/trunk/net/ipv4/tcp_probe.c b/trunk/net/ipv4/tcp_probe.c index 6211e2114173..85ee7eb7e38e 100644 --- a/trunk/net/ipv4/tcp_probe.c +++ b/trunk/net/ipv4/tcp_probe.c @@ -154,7 +154,7 @@ static int tcpprobe_sprint(char *tbuf, int n) struct timespec tv = ktime_to_timespec(ktime_sub(p->tstamp, tcp_probe.start)); - return snprintf(tbuf, n, + return scnprintf(tbuf, n, "%lu.%09lu %pI4:%u %pI4:%u %d %#x %#x %u %u %u %u\n", (unsigned long) tv.tv_sec, (unsigned long) tv.tv_nsec, @@ -174,7 +174,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf, return -EINVAL; while (cnt < len) { - char tbuf[128]; + char tbuf[164]; int width; /* Wait for data in buffer */