tty_operations->remove is normally called like: queue_release_one_tty ->tty_shutdown ->tty_driver_remove_tty ->tty_operations->remove However tty_shutdown() is called from queue_release_one_tty() only if tty_operations->shutdown is NULL. But for pty, it is not. pty_unix98_shutdown() is used there as ->shutdown. So tty_operations->remove of pty (i.e. pty_unix98_remove()) is never called. This results in invalid pty_count. I.e. what can be seen in /proc/sys/kernel/pty/nr. I see this was already reported at: https://lkml.org/lkml/2009/11/5/370 But it was not fixed since then. This patch is kind of a hackish way. The problem lies in ->install. We allocate there another tty (so-called tty->link). So ->install is called once, but ->remove twice, for both tty and tty->link. The fix here is to count both tty and tty->link and divide the count by 2 for user. And to have ->remove called, let's make tty_driver_remove_tty() global and call that from pty_unix98_shutdown() (tty_operations->shutdown). While at it, let's document that when ->shutdown is defined, tty_shutdown() is not called.
Unified · Split
| @@ -446,8 +446,19 @@ static inline void legacy_pty_init(void) { } · 445 unmodified lines | ||
| 446 | 446 | int pty_limit = NR_UNIX98_PTY_DEFAULT; |
| 447 | 447 | static int pty_limit_min; |
| 448 | 448 | static int pty_limit_max = NR_UNIX98_PTY_MAX; |
| 449 | +static int tty_count; | |
| 449 | 450 | static int pty_count; |
| 450 | 451 | |
| 452 | +static inline void pty_inc_count(void) | |
| 453 | +{ | |
| 454 | + pty_count = (++tty_count) / 2; | |
| 455 | +} | |
| 456 | + | |
| 457 | +static inline void pty_dec_count(void) | |
| 458 | +{ | |
| 459 | + pty_count = (--tty_count) / 2; | |
| 460 | +} | |
| 461 | + | |
| 451 | 462 | static struct cdev ptmx_cdev; |
| 452 | 463 | |
| 453 | 464 | static struct ctl_table pty_table[] = { |
| @@ -542,6 +553,7 @@ static struct tty_struct *pts_unix98_lookup(struct tty_driver *driver, · 88 unmodified lines | ||
| 542 | 553 | |
| 543 | 554 | static void pty_unix98_shutdown(struct tty_struct *tty) |
| 544 | 555 | { |
| 556 | + tty_driver_remove_tty(tty->driver, tty); | |
| 545 | 557 | /* We have our own method as we don't use the tty index */ |
| 546 | 558 | kfree(tty->termios); |
| 547 | 559 | } |
| @@ -588,7 +600,8 @@ static int pty_unix98_install(struct tty_driver *driver, struct tty_struct *tty) · 40 unmodified lines | ||
| 588 | 600 | */ |
| 589 | 601 | tty_driver_kref_get(driver); |
| 590 | 602 | tty->count++; |
| 591 | − pty_count++; | |
| 603 | + pty_inc_count(); /* tty */ | |
| 604 | + pty_inc_count(); /* tty->link */ | |
| 592 | 605 | return 0; |
| 593 | 606 | err_free_mem: |
| 594 | 607 | deinitialize_tty_struct(o_tty); |
| @@ -602,7 +615,7 @@ err_free_tty: · 7 unmodified lines | ||
| 602 | 615 | |
| 603 | 616 | static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty) |
| 604 | 617 | { |
| 605 | − pty_count--; | |
| 618 | + pty_dec_count(); | |
| 606 | 619 | } |
| 607 | 620 | |
| 608 | 621 | static const struct tty_operations ptm_unix98_ops = { |
| @@ -1295,8 +1295,7 @@ static int tty_driver_install_tty(struct tty_driver *driver, · 1294 unmodified lines | ||
| 1295 | 1295 | * |
| 1296 | 1296 | * Locking: tty_mutex for now |
| 1297 | 1297 | */ |
| 1298 | −static void tty_driver_remove_tty(struct tty_driver *driver, | |
| 1299 | − struct tty_struct *tty) | |
| 1298 | +void tty_driver_remove_tty(struct tty_driver *driver, struct tty_struct *tty) | |
| 1300 | 1299 | { |
| 1301 | 1300 | if (driver->ops->remove) |
| 1302 | 1301 | driver->ops->remove(driver, tty); |
| @@ -421,6 +421,8 @@ extern void tty_driver_flush_buffer(struct tty_struct *tty); · 420 unmodified lines | ||
| 421 | 421 | extern void tty_throttle(struct tty_struct *tty); |
| 422 | 422 | extern void tty_unthrottle(struct tty_struct *tty); |
| 423 | 423 | extern int tty_do_resize(struct tty_struct *tty, struct winsize *ws); |
| 424 | +extern void tty_driver_remove_tty(struct tty_driver *driver, | |
| 425 | + struct tty_struct *tty); | |
| 424 | 426 | extern void tty_shutdown(struct tty_struct *tty); |
| 425 | 427 | extern void tty_free_termios(struct tty_struct *tty); |
| 426 | 428 | extern int is_current_pgrp_orphaned(void); |
| @@ -47,6 +47,9 @@ · 46 unmodified lines | ||
| 47 | 47 | * |
| 48 | 48 | * This routine is called synchronously when a particular tty device |
| 49 | 49 | * is closed for the last time freeing up the resources. |
| 50 | + * Note that tty_shutdown() is not called if ops->shutdown is defined. | |
| 51 | + * This means one is responsible to take care of calling ops->remove (e.g. | |
| 52 | + * via tty_driver_remove_tty) and releasing tty->termios. | |
| 50 | 53 | * |
| 51 | 54 | * |
| 52 | 55 | * void (*cleanup)(struct tty_struct * tty); |