tty: fix pid refcount leak in tty_signal_session_leader
PATCH 1/1 tty: fix pid refcount leak in tty_signal_session_leader
In the loop, every time when p->signal->leader is true, the function tty_signal_session_leader() will invoke get_pid() and return a reference of tty->pgrp with increased refcount to the local variable tty_pgrp or return NULL if it fails. After finishing the loop, the function invokes put_pid() for only once, decreasing the refcount that tty_pgrp keeps.
Refcount leaks may occur when the scenario that p->signal->leader is true happens more than once. In this assumption, if the above scenario happens n times in the loop, the function forgets to decrease the refcount for n-1 times, which causes refcount leaks.
Fix the issue by decreasing the current refcount of the local variable tty_pgrp before assigning new objects to it.
--- drivers/tty/tty_jobctrl.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/tty_jobctrl.c +2 -0
@@ -212,6 +212,8 @@ int tty_signal_session_leader(struct tty_struct *tty, int exit_session)__group_send_sig_info (SIGCONT ,SEND_SIG_PRIV , p);put_pid (p->signal->tty_old_pgrp);/* A noop */ spin_lock (&tty->ctrl_lock); +if (tty_pgrp) +put_pid (tty_pgrp); tty_pgrp =get_pid (tty->pgrp);if (tty->pgrp) p->signal->tty_old_pgrp =get_pid (tty->pgrp);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerQuoted 27 lines · Xin Xiong
In the loop, every time when
p->signal->leaderis true, the functiontty_signal_session_leader()will invokeget_pid()and return a reference oftty->pgrpwith increased refcount to the local variabletty_pgrpor return NULL if it fails. After finishing the loop, the function invokesput_pid()for only once, decreasing the refcount thattty_pgrpkeeps.Refcount leaks may occur when the scenario that
p->signal->leaderis true happens more than once. In this assumption, if the above scenario happens n times in the loop, the function forgets to decrease the refcount for n-1 times, which causes refcount leaks.Fix the issue by decreasing the current refcount of the local variable
tty_pgrpbefore assigning new objects to it.Signed-off-by Xiyu Yang <[email protected]>Signed-off-by Xin Tan <[email protected]>Signed-off-by Xin Xiong <[email protected]>--- drivers/tty/tty_jobctrl.c | 2 ++ 1 file changed, 2 insertions(+)drivers/tty/tty_jobctrl.c +0
-0
drivers/tty/tty_jobctrl.c int tty_signal_session_leader(struct tty_struct *tty, int exit_session) · line 216
Quoted 5 lines
drivers/tty/tty_jobctrl.c +2
-0@@ -212,6 +212,8 @@ int tty_signal_session_leader(struct tty_struct *tty, int exit_session)__group_send_sig_info (SIGCONT ,SEND_SIG_PRIV , p);put_pid (p->signal->tty_old_pgrp);/* A noop */ spin_lock (&tty->ctrl_lock); +if (tty_pgrp) +put_pid (tty_pgrp);
No need to check this before calling it.
But, the real question is why is this needed now? Nothing has changed in this area of the kernel for a very long time, so how did things get broken here?
How are you triggering this and what is the result when we have that additional reference?
thanks,
greg k-h
Quoted 13 lines · Xin Xiong
In the loop, every time when
p->signal->leaderis true, the functiontty_signal_session_leader()will invokeget_pid()and return a reference oftty->pgrpwith increased refcount to the local variabletty_pgrpor return NULL if it fails. After finishing the loop, the function invokesput_pid()for only once, decreasing the refcount thattty_pgrpkeeps.Refcount leaks may occur when the scenario that
p->signal->leaderis true happens more than once. In this assumption, if the above scenario happens n times in the loop, the function forgets to decrease the refcount for n-1 times, which causes refcount leaks.
Quoted 6 lines
Fix the issue by decreasing the current refcount of the local variable
tty_pgrpbefore assigning new objects to it.Signed-off-by Xiyu Yang <[email protected]>Signed-off-by Xin Tan <[email protected]>Signed-off-by Xin Xiong <[email protected]>
This SoB chain is out of order. If you are the author, your SoB should go first, if you are a commiter, the From line should correspond to the first SoB (not yours), if it's a group of authors (funny for one-/twoliner) then you consider to use Co-developed-by. Please, read Submitting Patches document.
...
drivers/tty/tty_jobctrl.c int tty_signal_session_leader(struct tty_struct *tty, int exit_session) · line 219
Quoted 7 lines
put_pid(p->signal->tty_old_pgrp); /* A noop */ spin_lock(&tty->ctrl_lock);drivers/tty/tty_jobctrl.c +2
-0+if (tty_pgrp) +put_pid (tty_pgrp); tty_pgrp =get_pid (tty->pgrp);if (tty->pgrp) p->signal->tty_old_pgrp =get_pid (tty->pgrp);
I guess this patch wasn't thought thru. You see the get_pid for it happens twice in a row. Perhaps you have to get the logic behind all these first?
P.S. ...on top of what Greg said.
Signature · 2 lines
With Best Regards, Andy Shevchenko