Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261660AbVAMPdK (ORCPT ); Thu, 13 Jan 2005 10:33:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261659AbVAMPbY (ORCPT ); Thu, 13 Jan 2005 10:31:24 -0500 Received: from www.ssc.unict.it ([151.97.230.9]:53508 "HELO ssc.unict.it") by vger.kernel.org with SMTP id S261652AbVAMPbB (ORCPT ); Thu, 13 Jan 2005 10:31:01 -0500 Subject: [patch 07/15] uml: fail xterm_open when we have no $DISPLAY To: akpm@osdl.org Cc: linux-kernel@vger.kernel.org, jdike@addtoit.com, user-mode-linux-devel@lists.sourceforge.net, blaisorblade_spam@yahoo.it, cw@f00f.org From: blaisorblade_spam@yahoo.it Date: Thu, 13 Jan 2005 06:09:08 +0100 Message-Id: <20050113050909.1712063255@zion> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2997 Lines: 77 From: Chris Wedgwood If UML wants to open an xterm channel and the xterm does not run properly (eg. terminates soon after starting) we will get a hang (a comment added in the patch explains why). This avoids the most common cause for this and adds a comment (which long term will go away with a rewrite of that code); the complete fix would be to catch the xterm process dying, up(&data->sem), and -EIO all requests from that point onwards. That applies for some of the other channels too, so part of the code should probably be abstracted a little and generalized. Signed-off-by: Chris Wedgwood Signed-off-by: Paolo 'Blaisorblade' Giarrusso --- linux-2.6.11-paolo/arch/um/drivers/xterm.c | 7 +++++++ linux-2.6.11-paolo/arch/um/drivers/xterm_kern.c | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff -puN arch/um/drivers/xterm_kern.c~uml-xterm-clarify arch/um/drivers/xterm_kern.c --- linux-2.6.11/arch/um/drivers/xterm_kern.c~uml-xterm-clarify 2005-01-13 02:02:52.984641072 +0100 +++ linux-2.6.11-paolo/arch/um/drivers/xterm_kern.c 2005-01-13 02:02:52.988640464 +0100 @@ -46,6 +46,8 @@ int xterm_fd(int socket, int *pid_out) printk(KERN_ERR "xterm_fd : failed to allocate xterm_wait\n"); return(-ENOMEM); } + + /* This is a locked semaphore... */ *data = ((struct xterm_wait) { .sem = __SEMAPHORE_INITIALIZER(data->sem, 0), .fd = socket, @@ -55,12 +57,17 @@ int xterm_fd(int socket, int *pid_out) err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt, SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, "xterm", data); - if(err){ + if (err){ printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, " "err = %d\n", err); ret = err; goto out; } + + /* ... so here we wait for an xterm interrupt. + * + * XXX Note, if the xterm doesn't work for some reason (eg. DISPLAY + * isn't set) this will hang... */ down(&data->sem); free_irq_by_irq_and_dev(XTERM_IRQ, data); diff -puN arch/um/drivers/xterm.c~uml-xterm-clarify arch/um/drivers/xterm.c --- linux-2.6.11/arch/um/drivers/xterm.c~uml-xterm-clarify 2005-01-13 02:02:52.985640920 +0100 +++ linux-2.6.11-paolo/arch/um/drivers/xterm.c 2005-01-13 02:02:52.988640464 +0100 @@ -97,6 +97,13 @@ int xterm_open(int input, int output, in if(os_access(argv[4], OS_ACC_X_OK) < 0) argv[4] = "port-helper"; + /* Check that DISPLAY is set, this doesn't guarantee the xterm + * will work but w/o it we can be pretty sure it won't. */ + if (!getenv("DISPLAY")) { + printk("xterm_open: $DISPLAY not set.\n"); + return -ENODEV; + } + fd = mkstemp(file); if(fd < 0){ printk("xterm_open : mkstemp failed, errno = %d\n", errno); _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/