Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f573bd17 authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

tty: Remove __GFP_NOFAIL from tty_add_file() 



This patch removes __GFP_NOFAIL use from tty_add_file() and adds proper error
handling to the call-sites of the function.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8a28af7f

drivers/char/pty.c

+3 −1
Original line number Diff line number Diff line
@@ -676,7 +676,9 @@ static int ptmx_open(struct inode *inode, struct file *filp) 


	set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */



	tty_add_file(tty, filp);

	retval = tty_add_file(tty, filp);

	if (retval)

		goto out;



	retval = devpts_pty_new(inode, tty->link);

	if (retval)

drivers/char/tty_io.c

+11 −4
Original line number Diff line number Diff line
@@ -196,12 +196,13 @@ static inline struct tty_struct *file_tty(struct file *file) 
}



/* Associate a new file with the tty structure */

void tty_add_file(struct tty_struct *tty, struct file *file)

int tty_add_file(struct tty_struct *tty, struct file *file)

{

	struct tty_file_private *priv;



	/* XXX: must implement proper error handling in callers */

	priv = kmalloc(sizeof(*priv), GFP_KERNEL|__GFP_NOFAIL);

	priv = kmalloc(sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	priv->tty = tty;

	priv->file = file;
@@ -210,6 +211,8 @@ void tty_add_file(struct tty_struct *tty, struct file *file) 
	spin_lock(&tty_files_lock);

	list_add(&priv->list, &tty->tty_files);

	spin_unlock(&tty_files_lock);



	return 0;

}



/* Delete file from its tty */
@@ -1877,7 +1880,11 @@ got_driver: 
		return PTR_ERR(tty);

	}



	tty_add_file(tty, filp);

	retval = tty_add_file(tty, filp);

	if (retval) {

		tty_unlock();

		return retval;

	}



	check_tty_count(tty, "tty_open");

	if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&

include/linux/tty.h

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ extern void proc_clear_tty(struct task_struct *p); 
extern struct tty_struct *get_current_tty(void);

extern void tty_default_fops(struct file_operations *fops);

extern struct tty_struct *alloc_tty_struct(void);

extern void tty_add_file(struct tty_struct *tty, struct file *file);

extern int tty_add_file(struct tty_struct *tty, struct file *file);

extern void free_tty_struct(struct tty_struct *tty);

extern void initialize_tty_struct(struct tty_struct *tty,

		struct tty_driver *driver, int idx);