Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several cases of bug fixes in 'net' overlapping other changes in 'net-next-. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -2812,7 +2812,8 @@ static int unix_seq_show(struct seq_file *seq, void *v)
|
||||
i++;
|
||||
}
|
||||
for ( ; i < len; i++)
|
||||
seq_putc(seq, u->addr->name->sun_path[i]);
|
||||
seq_putc(seq, u->addr->name->sun_path[i] ?:
|
||||
'@');
|
||||
}
|
||||
unix_state_unlock(s);
|
||||
seq_putc(seq, '\n');
|
||||
|
Reference in New Issue
Block a user