[lxc/lxc] f382bc: terminal: log TIOCGPTPEER failure less alarmingly

0 views
Skip to first unread message

Stéphane Graber

unread,
Jul 15, 2021, 1:19:41 PM (9 days ago) Jul 15
to lxc-...@lists.linuxcontainers.org
Branch: refs/heads/master
Home: https://github.com/lxc/lxc
Commit: f382bcc6d820c46a54ec928ea7cbfaa3847adc66
https://github.com/lxc/lxc/commit/f382bcc6d820c46a54ec928ea7cbfaa3847adc66
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-07-15 (Thu, 15 Jul 2021)

Changed paths:
M src/lxc/terminal.c

Log Message:
-----------
terminal: log TIOCGPTPEER failure less alarmingly

This is not a fatal error and the fallback codepath is equally safe.
When we use TIOCGPTPEER we're using a stashed fd to the container's
devpts mount's ptmx device and allocating a new fd non-path based
through this ioctl. If this ioctl can't be used we're falling back to
allocating a pts device from the host's devpts mount's ptmx device which
is path-based but is not under control of the container and so that's
safe. The difference is just that the first method gets you a nice
native terminal with all the pleasantries of having tty and friends
working whereas the latter method does not.

Fixes: #3625
Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: 95103b60958f959f4a0c095968bdd50c2307867f
https://github.com/lxc/lxc/commit/95103b60958f959f4a0c095968bdd50c2307867f
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-07-15 (Thu, 15 Jul 2021)

Changed paths:
M src/lxc/af_unix.c

Log Message:
-----------
af_unix: report error when no fd is to be sent

Fixes: #3624
Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: 8cff10d6a893f384aeac71cb4c42cc468b96319f
https://github.com/lxc/lxc/commit/8cff10d6a893f384aeac71cb4c42cc468b96319f
Author: Stéphane Graber <stgr...@ubuntu.com>
Date: 2021-07-15 (Thu, 15 Jul 2021)

Changed paths:
M src/lxc/af_unix.c
M src/lxc/terminal.c

Log Message:
-----------
Merge pull request #3907 from brauner/2021-07-15.fixes.3

terminal: log TIOCGPTPEER failure less alarmingly


Compare: https://github.com/lxc/lxc/compare/93e25482090e...8cff10d6a893
Reply all
Reply to author
Forward
0 new messages