* [PATCH/BK] RESEND TRIVIAL fix run-together lines in /proc/tty/driver/serial
@ 2003-10-29 3:12 Matthias Andree
2003-10-29 9:17 ` Russell King
0 siblings, 1 reply; 2+ messages in thread
From: Matthias Andree @ 2003-10-29 3:12 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux-Kernel mailing list
Hi,
/proc/tty/driver/serial runs together lines for known UARTS when the
user has no CAP_SYS_ADMIN capabilities. The patch below fixes this.
Works and fixes the problem for me.
GNU patch and BK send format below, or bk pull bk://129.217.163.1/linux-2.5/
serial_core.c | 3 +++
1 files changed, 3 insertions(+)
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1350.1.9 -> 1.1350.2.1
# drivers/serial/serial_core.c 1.72 -> 1.73
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/10/26 torvalds@home.osdl.org 1.1350.1.10
# Add a sticky "PF_DEAD" task flag to keep track of dead processes.
#
# Use this to simplify 'finish_task_switch', but perhaps more
# importantly we can use this to track down why some processes
# seem to sometimes not die properly even after having been
# marked as ZOMBIE. The "task->state" flags are too fluid to
# allow that well.
# --------------------------------------------
# 03/10/27 matthias.andree@gmx.de 1.1350.2.1
# Properly terminate /proc/tty/driver/serial output lines of known UARTS
# when the caller has no CAP_SYS_ADMIN capability.
# --------------------------------------------
#
diff -Nru a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
--- a/drivers/serial/serial_core.c Wed Oct 29 04:10:06 2003
+++ b/drivers/serial/serial_core.c Wed Oct 29 04:10:06 2003
@@ -1707,6 +1707,9 @@
strcat(stat_buf, "\n");
ret += sprintf(buf + ret, stat_buf);
+ } else {
+ strcat(buf, "\n");
+ ret++;
}
#undef STATBIT
#undef INFOBIT
BK SEND FORMAT:
This BitKeeper patch contains the following changesets:
1.1350.2.1
# User: matthias.andree
# Host: gmx.de
# Root: /suse/kernel/BK/linux-2.5
# Patch vers: 1.3
# Patch type: REGULAR
== ChangeSet ==
torvalds@athlon.transmeta.com|ChangeSet|20020205173056|16047|c1d11a41ed024864
tausq@debian.org[torvalds]|ChangeSet|20031026222704|00647
D 1.1350.2.1 03/10/27 06:29:34+01:00 matthias.andree@gmx.de +1 -0
B torvalds@athlon.transmeta.com|ChangeSet|20020205173056|16047|c1d11a41ed024864
C
c Properly terminate /proc/tty/driver/serial output lines of known UARTS
c when the caller has no CAP_SYS_ADMIN capability.
K 24
P ChangeSet
------------------------------------------------
0a0
> rmk@arm.linux.org.uk|drivers/serial/serial_core.c|20020721233929|00111|3231cf8b6efd7067 matthias.andree@gmx.de|drivers/serial/serial_core.c|20031027050655|19065
== drivers/serial/serial_core.c ==
rmk@arm.linux.org.uk|drivers/serial/serial_core.c|20020721233929|00111|3231cf8b6efd7067
rddunlap@osdl.org[torvalds]|drivers/serial/serial_core.c|20031006052957|16317
D 1.73 03/10/27 06:06:55+01:00 matthias.andree@gmx.de +3 -0
B torvalds@athlon.transmeta.com|ChangeSet|20020205173056|16047|c1d11a41ed024864
C
c Properly terminate /proc/tty/driver/serial output lines of known UARTS
c when the caller has no CAP_SYS_ADMIN capability.
K 19065
O -rw-rw-r--
P drivers/serial/serial_core.c
------------------------------------------------
I1709 3
} else {
strcat(buf, "\n");
ret++;
# Patch checksum=e2499498
--
Matthias Andree
Encrypt your mail: my GnuPG key ID is 0x052E7D95
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH/BK] RESEND TRIVIAL fix run-together lines in /proc/tty/driver/serial
2003-10-29 3:12 [PATCH/BK] RESEND TRIVIAL fix run-together lines in /proc/tty/driver/serial Matthias Andree
@ 2003-10-29 9:17 ` Russell King
0 siblings, 0 replies; 2+ messages in thread
From: Russell King @ 2003-10-29 9:17 UTC (permalink / raw)
To: Linus Torvalds, Linux-Kernel mailing list
On Wed, Oct 29, 2003 at 04:12:32AM +0100, Matthias Andree wrote:
> /proc/tty/driver/serial runs together lines for known UARTS when the
> user has no CAP_SYS_ADMIN capabilities. The patch below fixes this.
> Works and fixes the problem for me.
> GNU patch and BK send format below, or bk pull bk://129.217.163.1/linux-2.5/
I've merged this into my tree. Thanks for the fix.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-10-29 9:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-10-29 3:12 [PATCH/BK] RESEND TRIVIAL fix run-together lines in /proc/tty/driver/serial Matthias Andree
2003-10-29 9:17 ` Russell King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).