Commit dcc223e8 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: remove file from tty_mode_ioctl 



The only user of 'file' parameter in tty_mode_ioctl is a BUG_ON check.
Provided it never crashed for anyone, it's an overkill to pass the
parameter to tty_mode_ioctl only for this check.

If we wanted to check 'file' there, we should handle it in more graceful
way anyway. Not by a BUG == crash.

Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Andreas Koensgen <ajk@comnets.uni-bremen.de>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210914091134.17426-5-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28f194da

drivers/net/can/slcan.c

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ static int slcan_ioctl(struct tty_struct *tty, struct file *file, 
		return -EINVAL;



	default:

		return tty_mode_ioctl(tty, file, cmd, arg);

		return tty_mode_ioctl(tty, cmd, arg);

	}

}

drivers/net/hamradio/6pack.c

+1 −1
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static int sixpack_ioctl(struct tty_struct *tty, struct file *file, 
			break;

		}

	default:

		err = tty_mode_ioctl(tty, file, cmd, arg);

		err = tty_mode_ioctl(tty, cmd, arg);

	}



	sp_put(sp);

drivers/net/ppp/ppp_async.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file, 


	default:

		/* Try the various mode ioctls */

		err = tty_mode_ioctl(tty, file, cmd, arg);

		err = tty_mode_ioctl(tty, cmd, arg);

	}



	ap_put(ap);

drivers/net/ppp/ppp_synctty.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ ppp_synctty_ioctl(struct tty_struct *tty, struct file *file, 
		break;



	default:

		err = tty_mode_ioctl(tty, file, cmd, arg);

		err = tty_mode_ioctl(tty, cmd, arg);

		break;

	}

drivers/net/slip/slip.c

+1 −1
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ static int slip_ioctl(struct tty_struct *tty, struct file *file, 
	/* VSV changes end */

#endif

	default:

		return tty_mode_ioctl(tty, file, cmd, arg);

		return tty_mode_ioctl(tty, cmd, arg);

	}

}