Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1634518 > unrolled thread
| Started by | Dmitry Vyukov <dvyukov@google.com> |
|---|---|
| First post | 2017-05-02 18:40 +0200 |
| Last post | 2017-05-03 14:10 +0200 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
Re: [GIT PULL] TTY/Serial driver fixes for 4.11-rc4 Dmitry Vyukov <dvyukov@google.com> - 2017-05-02 18:40 +0200
Re: [GIT PULL] TTY/Serial driver fixes for 4.11-rc4 Vegard Nossum <vegard.nossum@gmail.com> - 2017-05-03 00:00 +0200
Re: [GIT PULL] TTY/Serial driver fixes for 4.11-rc4 Dmitry Vyukov <dvyukov@google.com> - 2017-05-03 13:30 +0200
Re: [GIT PULL] TTY/Serial driver fixes for 4.11-rc4 Greg KH <gregkh@linuxfoundation.org> - 2017-05-03 14:10 +0200
| From | Dmitry Vyukov <dvyukov@google.com> |
|---|---|
| Date | 2017-05-02 18:40 +0200 |
| Subject | Re: [GIT PULL] TTY/Serial driver fixes for 4.11-rc4 |
| Message-ID | <tCJ0e-ID-11@gated-at.bofh.it> |
On Fri, Apr 14, 2017 at 2:30 PM, Greg KH <gregkh@linuxfoundation.org> wrote: > On Fri, Apr 14, 2017 at 11:41:26AM +0200, Vegard Nossum wrote: >> On 13 April 2017 at 20:34, Greg KH <gregkh@linuxfoundation.org> wrote: >> > On Thu, Apr 13, 2017 at 09:07:40AM -0700, Linus Torvalds wrote: >> >> On Thu, Apr 13, 2017 at 3:50 AM, Vegard Nossum <vegard.nossum@gmail.com> wrote: >> >> > >> >> > I've bisected a syzkaller crash down to this commit >> >> > (5362544bebe85071188dd9e479b5a5040841c895). The crash is: >> >> > >> >> > [ 25.137552] BUG: unable to handle kernel paging request at 0000000000002280 >> >> > [ 25.137579] IP: mutex_lock_interruptible+0xb/0x30 >> >> >> >> It would seem to be the >> >> >> >> if (mutex_lock_interruptible(&ldata->atomic_read_lock)) >> >> >> >> call in n_tty_read(), the offset is about right for a NULL 'ldata' >> >> pointer (it's a big structure, it has a couple of character buffers of >> >> size N_TTY_BUF_SIZE). >> >> >> >> I don't see the obvious fix, so I suspect at this point we should just >> >> revert, as that commit seems to introduce worse problems that it is >> >> supposed to fix. Greg? >> > >> > Unless Dmitry has a better idea, I will just revert it and send you the >> > pull request in a day or so. >> >> I don't think we need to rush a revert, I'd hope there's a way to fix >> it properly. > > For this late in the release cycle, for something as complex as tty > ldisc handling, for an issue that has been present for over a decade, > the safest thing right now is to go back to the old well-known code by > applying a revert :) > >> So the original problem is that the vmalloc() in n_tty_open() can >> fail, and that will panic in tty_set_ldisc()/tty_ldisc_restore() >> because of its unwillingness to proceed if the tty doesn't have an >> ldisc. >> >> Dmitry fixed this by allowing tty->ldisc == NULL in the case of memory >> allocation failure as we can see from the comment in tty_set_ldisc(). >> >> Unfortunately, it would appear that some other bits of code do not >> like tty->ldisc == NULL (other than the crash in this thread, I saw >> 2-3 similar crashes in other functions, e.g. poll()). I see two >> possibilities: >> >> 1) make other code handle tty->ldisc == NULL. >> >> 2) don't close/free the old ldisc until the new one has been >> successfully created/initialised/opened/attached to the tty, and >> return an error to userspace if changing it failed. >> >> I'm leaning towards #2 as the more obviously correct fix, it makes >> tty_set_ldisc() transactional, the fix seems limited in scope to >> tty_set_ldisc() itself, and we don't need to make every other bit of >> code that uses tty->ldisc handle the NULL case. > > That sounds reasonable to me, care to work on a patch for this? Vegard, do you know how to do this? That was first thing that I tried, but I did not manage to make it work. disc is tied to tty, so it's not that one can create a fully initialized disc on the side and then simply swap pointers. Looking at the code now, there is at least TTY_LDISC_OPEN bit in tty. But as far as I remember there were more fundamental problems. Or maybe I just did not try too hard.
[toc] | [next] | [standalone]
| From | Vegard Nossum <vegard.nossum@gmail.com> |
|---|---|
| Date | 2017-05-03 00:00 +0200 |
| Message-ID | <tCNZT-3O5-3@gated-at.bofh.it> |
| In reply to | #1634518 |
On 2 May 2017 at 18:35, Dmitry Vyukov <dvyukov@google.com> wrote: > On Fri, Apr 14, 2017 at 2:30 PM, Greg KH <gregkh@linuxfoundation.org> wrote: >> On Fri, Apr 14, 2017 at 11:41:26AM +0200, Vegard Nossum wrote: >>> On 13 April 2017 at 20:34, Greg KH <gregkh@linuxfoundation.org> wrote: >>> > On Thu, Apr 13, 2017 at 09:07:40AM -0700, Linus Torvalds wrote: >>> >> On Thu, Apr 13, 2017 at 3:50 AM, Vegard Nossum <vegard.nossum@gmail.com> wrote: >>> So the original problem is that the vmalloc() in n_tty_open() can >>> fail, and that will panic in tty_set_ldisc()/tty_ldisc_restore() >>> because of its unwillingness to proceed if the tty doesn't have an >>> ldisc. >>> >>> Dmitry fixed this by allowing tty->ldisc == NULL in the case of memory >>> allocation failure as we can see from the comment in tty_set_ldisc(). >>> >>> Unfortunately, it would appear that some other bits of code do not >>> like tty->ldisc == NULL (other than the crash in this thread, I saw >>> 2-3 similar crashes in other functions, e.g. poll()). I see two >>> possibilities: >>> >>> 1) make other code handle tty->ldisc == NULL. >>> >>> 2) don't close/free the old ldisc until the new one has been >>> successfully created/initialised/opened/attached to the tty, and >>> return an error to userspace if changing it failed. >>> >>> I'm leaning towards #2 as the more obviously correct fix, it makes >>> tty_set_ldisc() transactional, the fix seems limited in scope to >>> tty_set_ldisc() itself, and we don't need to make every other bit of >>> code that uses tty->ldisc handle the NULL case. >> >> That sounds reasonable to me, care to work on a patch for this? > > Vegard, do you know how to do this? > That was first thing that I tried, but I did not manage to make it > work. disc is tied to tty, so it's not that one can create a fully > initialized disc on the side and then simply swap pointers. Looking at > the code now, there is at least TTY_LDISC_OPEN bit in tty. But as far > as I remember there were more fundamental problems. Or maybe I just > did not try too hard. I had a look at it but like you said, the tty/ldisc relationship is complicated :-/ Maybe we can split up ldisc initialisation into two methods so that the first one (e.g. ->alloc) does all the allocation and is allowed to fail and the second one (e.g. ->open) is not allowed to fail. Then you can allocate a new ldisc without freeing the old one and only swap them over if the allocation succeeded. That would require fixing up ->open for all the ldisc drivers though, I'm not sure how easy/feasible it is. I'll think about possible solutions, but I have no prior experience with the tty code. In the meantime syzkaller also hit a couple of other fun tty/pty bugs including a write/ioctl race that results in buffer overflow :-/ Vegard
[toc] | [prev] | [next] | [standalone]
| From | Dmitry Vyukov <dvyukov@google.com> |
|---|---|
| Date | 2017-05-03 13:30 +0200 |
| Message-ID | <tD0DM-4DU-11@gated-at.bofh.it> |
| In reply to | #1634636 |
On Tue, May 2, 2017 at 11:52 PM, Vegard Nossum <vegard.nossum@gmail.com> wrote: >>>> So the original problem is that the vmalloc() in n_tty_open() can >>>> fail, and that will panic in tty_set_ldisc()/tty_ldisc_restore() >>>> because of its unwillingness to proceed if the tty doesn't have an >>>> ldisc. >>>> >>>> Dmitry fixed this by allowing tty->ldisc == NULL in the case of memory >>>> allocation failure as we can see from the comment in tty_set_ldisc(). >>>> >>>> Unfortunately, it would appear that some other bits of code do not >>>> like tty->ldisc == NULL (other than the crash in this thread, I saw >>>> 2-3 similar crashes in other functions, e.g. poll()). I see two >>>> possibilities: >>>> >>>> 1) make other code handle tty->ldisc == NULL. >>>> >>>> 2) don't close/free the old ldisc until the new one has been >>>> successfully created/initialised/opened/attached to the tty, and >>>> return an error to userspace if changing it failed. >>>> >>>> I'm leaning towards #2 as the more obviously correct fix, it makes >>>> tty_set_ldisc() transactional, the fix seems limited in scope to >>>> tty_set_ldisc() itself, and we don't need to make every other bit of >>>> code that uses tty->ldisc handle the NULL case. >>> >>> That sounds reasonable to me, care to work on a patch for this? >> >> Vegard, do you know how to do this? >> That was first thing that I tried, but I did not manage to make it >> work. disc is tied to tty, so it's not that one can create a fully >> initialized disc on the side and then simply swap pointers. Looking at >> the code now, there is at least TTY_LDISC_OPEN bit in tty. But as far >> as I remember there were more fundamental problems. Or maybe I just >> did not try too hard. > > I had a look at it but like you said, the tty/ldisc relationship is > complicated :-/ > > Maybe we can split up ldisc initialisation into two methods so that > the first one (e.g. ->alloc) does all the allocation and is allowed to > fail and the second one (e.g. ->open) is not allowed to fail. Then you > can allocate a new ldisc without freeing the old one and only swap > them over if the allocation succeeded. > > That would require fixing up ->open for all the ldisc drivers though, > I'm not sure how easy/feasible it is. What do you think about making all tty code deal with NULL disc? It seems that most of code is already prepared for this. > I'll think about possible solutions, but I have no prior experience > with the tty code. In the meantime syzkaller also hit a couple of > other fun tty/pty bugs including a write/ioctl race that results in > buffer overflow :-/ > > > Vegard
[toc] | [prev] | [next] | [standalone]
| From | Greg KH <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-05-03 14:10 +0200 |
| Message-ID | <tD1gw-5a8-51@gated-at.bofh.it> |
| In reply to | #1634636 |
On Tue, May 02, 2017 at 11:52:40PM +0200, Vegard Nossum wrote: > On 2 May 2017 at 18:35, Dmitry Vyukov <dvyukov@google.com> wrote: > > On Fri, Apr 14, 2017 at 2:30 PM, Greg KH <gregkh@linuxfoundation.org> wrote: > >> On Fri, Apr 14, 2017 at 11:41:26AM +0200, Vegard Nossum wrote: > >>> On 13 April 2017 at 20:34, Greg KH <gregkh@linuxfoundation.org> wrote: > >>> > On Thu, Apr 13, 2017 at 09:07:40AM -0700, Linus Torvalds wrote: > >>> >> On Thu, Apr 13, 2017 at 3:50 AM, Vegard Nossum <vegard.nossum@gmail.com> wrote: > >>> So the original problem is that the vmalloc() in n_tty_open() can > >>> fail, and that will panic in tty_set_ldisc()/tty_ldisc_restore() > >>> because of its unwillingness to proceed if the tty doesn't have an > >>> ldisc. > >>> > >>> Dmitry fixed this by allowing tty->ldisc == NULL in the case of memory > >>> allocation failure as we can see from the comment in tty_set_ldisc(). > >>> > >>> Unfortunately, it would appear that some other bits of code do not > >>> like tty->ldisc == NULL (other than the crash in this thread, I saw > >>> 2-3 similar crashes in other functions, e.g. poll()). I see two > >>> possibilities: > >>> > >>> 1) make other code handle tty->ldisc == NULL. > >>> > >>> 2) don't close/free the old ldisc until the new one has been > >>> successfully created/initialised/opened/attached to the tty, and > >>> return an error to userspace if changing it failed. > >>> > >>> I'm leaning towards #2 as the more obviously correct fix, it makes > >>> tty_set_ldisc() transactional, the fix seems limited in scope to > >>> tty_set_ldisc() itself, and we don't need to make every other bit of > >>> code that uses tty->ldisc handle the NULL case. > >> > >> That sounds reasonable to me, care to work on a patch for this? > > > > Vegard, do you know how to do this? > > That was first thing that I tried, but I did not manage to make it > > work. disc is tied to tty, so it's not that one can create a fully > > initialized disc on the side and then simply swap pointers. Looking at > > the code now, there is at least TTY_LDISC_OPEN bit in tty. But as far > > as I remember there were more fundamental problems. Or maybe I just > > did not try too hard. > > I had a look at it but like you said, the tty/ldisc relationship is > complicated :-/ > > Maybe we can split up ldisc initialisation into two methods so that > the first one (e.g. ->alloc) does all the allocation and is allowed to > fail and the second one (e.g. ->open) is not allowed to fail. Then you > can allocate a new ldisc without freeing the old one and only swap > them over if the allocation succeeded. > > That would require fixing up ->open for all the ldisc drivers though, > I'm not sure how easy/feasible it is. We don't have that many ldisc drivers, so it shouldn't be that hard to change to use this. It makes a lot more sense to fix this the correct way like this. > I'll think about possible solutions, but I have no prior experience > with the tty code. In the meantime syzkaller also hit a couple of > other fun tty/pty bugs including a write/ioctl race that results in > buffer overflow :-/ Ugh, let me know what they are and we'll work to fix them. Thanks for all of the work you all are doing in finding these issues, I might grumble about having to fix this and what a pain it is, but it's just me being grumpy about the tty code, not your effort. Your effort is much appreciated. thanks, greg k-h
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web