Messages in this thread | | | Date | Sun, 30 Nov 2008 08:31:28 +0530 | From | Balbir Singh <> | Subject | Re: [PATCH][UML] Boot broken due to buffer overrun |
| |
* WANG Cong <xiyou.wangcong@gmail.com> [2008-11-29 13:03:42]:
> On Sat, Nov 29, 2008 at 10:08 AM, Balbir Singh > <balbir@linux.vnet.ibm.com> wrote: > > > > mconsole_init() passed 256 bytes as length in os_create_unix_socket, while > > the sizeof UNIX_PATH_MAX is 108. This patch fixes that problem and avoids > > a big overrun bug reported on UML bootup. > > > > Reported-by: Vikas K Managutte <vikki.km@gmail.com> > > Reported-by: Sarvesh Kumar Lal Das <skldas@gmail.com> > > Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> > > --- > > > > arch/um/drivers/mconsole_kern.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff -puN arch/um/drivers/mconsole_kern.c~fix-uml-buggy-socket-creation arch/um/drivers/mconsole_kern.c > > --- linux-2.6.28-rc6/arch/um/drivers/mconsole_kern.c~fix-uml-buggy-socket-creation 2008-11-29 15:29:04.000000000 +0530 > > +++ linux-2.6.28-rc6-balbir/arch/um/drivers/mconsole_kern.c 2008-11-29 15:32:23.000000000 +0530 > > @@ -16,6 +16,8 @@ > > #include <linux/slab.h> > > #include <linux/syscalls.h> > > #include <linux/utsname.h> > > +#include <linux/socket.h> > > +#include <linux/un.h> > > #include <linux/workqueue.h> > > #include <linux/mutex.h> > > #include <asm/uaccess.h> > > @@ -785,7 +787,7 @@ static int __init mconsole_init(void) > > /* long to avoid size mismatch warnings from gcc */ > > long sock; > > int err; > > - char file[256]; > > + char file[UNIX_PATH_MAX]; > > > > > Aha, good spot! > > Please also correct the length of mconsole_socket_name. >
I did not fix that with UNIX_PATH_MAX since, mconsole_user.c already includes sys/un.h and sys/socket.h and I did not want to include kernel headers linux/socket.h and linux/un.h there. I could have hard-coded those values to 108, but I just let it be for now. If you feel strongly about it, it can be done.
> Anyway, > > Reviewed-by: WANG Cong <wangcong@zeuux.org>
Thanks!
-- Balbir
| |