From: Blaisorblade <blaisorblade@yahoo.it>
To: user-mode-linux-devel@lists.sourceforge.net
Cc: Andrew Morton <akpm@osdl.org>, Jeff Dike <jdike@karaya.com>,
Johannes Stezenbach <js@linuxtv.org>,
linux-kernel@vger.kernel.org
Subject: Re: [uml-devel] [PATCH] [UML] fix mknod
Date: Tue, 23 Jan 2007 09:02:30 +0100 [thread overview]
Message-ID: <200701230902.30715.blaisorblade@yahoo.it> (raw)
In-Reply-To: <20070122201317.GA8594@linuxtv.org>
On Monday 22 January 2007 21:13, Johannes Stezenbach wrote:
> Hi,
>
> I was playing with user-mode Linux and found that mknod creates
> devices node in hostfs with wrong major/minor numbers.
> The patch below fixes it for me.
>
> Johannes
Hmpf. Still having this bug on hostfs is quite bad. Thanks for reporting.
It should be hostfs_user.c to take major and minor and to combine them
correctly - it can use libc's macros.
> Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
>
>
> diff -rup linux-2.6.19.orig/fs/hostfs/hostfs.h
> linux-2.6.19/fs/hostfs/hostfs.h ---
> linux-2.6.19.orig/fs/hostfs/hostfs.h 2006-11-29 22:57:37.000000000 +0100
> +++ linux-2.6.19/fs/hostfs/hostfs.h 2007-01-22 20:53:23.000000000 +0100 @@
> -76,7 +76,17 @@ extern int make_symlink(const char *from
> extern int unlink_file(const char *file);
> extern int do_mkdir(const char *file, int mode);
> extern int do_rmdir(const char *file);
> -extern int do_mknod(const char *file, int mode, int dev);
> +
> +/* gnu_dev_makedev from glibc's sys/sysmacros.h */
> +static inline unsigned long long makedev(unsigned int major, unsigned int
> minor) +{
> + return ((minor & 0xff) | ((major & 0xfff) << 8)
> + | (((unsigned long long int) (minor & ~0xff)) << 12)
> + | (((unsigned long long int) (major & ~0xfff)) << 32));
> +
> +}
> +
> +extern int do_mknod(const char *file, int mode, unsigned long long dev);
> extern int link_file(const char *from, const char *to);
> extern int do_readlink(char *file, char *buf, int size);
> extern int rename_file(char *from, char *to);
> diff -rup linux-2.6.19.orig/fs/hostfs/hostfs_kern.c
> linux-2.6.19/fs/hostfs/hostfs_kern.c ---
> linux-2.6.19.orig/fs/hostfs/hostfs_kern.c 2006-11-29 22:57:37.000000000
> +0100 +++ linux-2.6.19/fs/hostfs/hostfs_kern.c 2007-01-22
> 20:57:58.000000000 +0100 @@ -740,6 +740,7 @@ int hostfs_mknod(struct inode
> *dir, stru
> struct inode *inode;
> char *name;
> int err = -ENOMEM;
> + unsigned long long udev;
>
> inode = iget(dir->i_sb, 0);
> if(inode == NULL)
> @@ -755,7 +756,9 @@ int hostfs_mknod(struct inode *dir, stru
> goto out_put;
>
> init_special_inode(inode, mode, dev);
> - err = do_mknod(name, mode, dev);
> + /* userspace has different dev_t encoding than kernel... */
> + udev = makedev(MAJOR(dev), MINOR(dev));
> + err = do_mknod(name, mode, udev);
> if(err)
> goto out_free;
>
> diff -rup linux-2.6.19.orig/fs/hostfs/hostfs_user.c
> linux-2.6.19/fs/hostfs/hostfs_user.c ---
> linux-2.6.19.orig/fs/hostfs/hostfs_user.c 2006-11-29 22:57:37.000000000
> +0100 +++ linux-2.6.19/fs/hostfs/hostfs_user.c 2007-01-22
> 20:54:37.000000000 +0100 @@ -295,7 +295,7 @@ int do_rmdir(const char *file)
> return(0);
> }
>
> -int do_mknod(const char *file, int mode, int dev)
> +int do_mknod(const char *file, int mode, unsigned long long dev)
> {
> int err;
>
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share
> your opinions on IT & business topics through brief surveys - and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> User-mode-linux-devel mailing list
> User-mode-linux-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
--
Inform me of my mistakes, so I can add them to my list!
Paolo Giarrusso, aka Blaisorblade
http://www.user-mode-linux.org/~blaisorblade
Chiacchiera con i tuoi amici in tempo reale!
http://it.yahoo.com/mail_it/foot/*http://it.messenger.yahoo.com
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
WARNING: multiple messages have this Message-ID (diff)
From: Blaisorblade <blaisorblade@yahoo.it>
To: user-mode-linux-devel@lists.sourceforge.net
Cc: Johannes Stezenbach <js@linuxtv.org>,
Jeff Dike <jdike@karaya.com>, Andrew Morton <akpm@osdl.org>,
linux-kernel@vger.kernel.org
Subject: Re: [uml-devel] [PATCH] [UML] fix mknod
Date: Tue, 23 Jan 2007 09:02:30 +0100 [thread overview]
Message-ID: <200701230902.30715.blaisorblade@yahoo.it> (raw)
In-Reply-To: <20070122201317.GA8594@linuxtv.org>
On Monday 22 January 2007 21:13, Johannes Stezenbach wrote:
> Hi,
>
> I was playing with user-mode Linux and found that mknod creates
> devices node in hostfs with wrong major/minor numbers.
> The patch below fixes it for me.
>
> Johannes
Hmpf. Still having this bug on hostfs is quite bad. Thanks for reporting.
It should be hostfs_user.c to take major and minor and to combine them
correctly - it can use libc's macros.
> Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
>
>
> diff -rup linux-2.6.19.orig/fs/hostfs/hostfs.h
> linux-2.6.19/fs/hostfs/hostfs.h ---
> linux-2.6.19.orig/fs/hostfs/hostfs.h 2006-11-29 22:57:37.000000000 +0100
> +++ linux-2.6.19/fs/hostfs/hostfs.h 2007-01-22 20:53:23.000000000 +0100 @@
> -76,7 +76,17 @@ extern int make_symlink(const char *from
> extern int unlink_file(const char *file);
> extern int do_mkdir(const char *file, int mode);
> extern int do_rmdir(const char *file);
> -extern int do_mknod(const char *file, int mode, int dev);
> +
> +/* gnu_dev_makedev from glibc's sys/sysmacros.h */
> +static inline unsigned long long makedev(unsigned int major, unsigned int
> minor) +{
> + return ((minor & 0xff) | ((major & 0xfff) << 8)
> + | (((unsigned long long int) (minor & ~0xff)) << 12)
> + | (((unsigned long long int) (major & ~0xfff)) << 32));
> +
> +}
> +
> +extern int do_mknod(const char *file, int mode, unsigned long long dev);
> extern int link_file(const char *from, const char *to);
> extern int do_readlink(char *file, char *buf, int size);
> extern int rename_file(char *from, char *to);
> diff -rup linux-2.6.19.orig/fs/hostfs/hostfs_kern.c
> linux-2.6.19/fs/hostfs/hostfs_kern.c ---
> linux-2.6.19.orig/fs/hostfs/hostfs_kern.c 2006-11-29 22:57:37.000000000
> +0100 +++ linux-2.6.19/fs/hostfs/hostfs_kern.c 2007-01-22
> 20:57:58.000000000 +0100 @@ -740,6 +740,7 @@ int hostfs_mknod(struct inode
> *dir, stru
> struct inode *inode;
> char *name;
> int err = -ENOMEM;
> + unsigned long long udev;
>
> inode = iget(dir->i_sb, 0);
> if(inode == NULL)
> @@ -755,7 +756,9 @@ int hostfs_mknod(struct inode *dir, stru
> goto out_put;
>
> init_special_inode(inode, mode, dev);
> - err = do_mknod(name, mode, dev);
> + /* userspace has different dev_t encoding than kernel... */
> + udev = makedev(MAJOR(dev), MINOR(dev));
> + err = do_mknod(name, mode, udev);
> if(err)
> goto out_free;
>
> diff -rup linux-2.6.19.orig/fs/hostfs/hostfs_user.c
> linux-2.6.19/fs/hostfs/hostfs_user.c ---
> linux-2.6.19.orig/fs/hostfs/hostfs_user.c 2006-11-29 22:57:37.000000000
> +0100 +++ linux-2.6.19/fs/hostfs/hostfs_user.c 2007-01-22
> 20:54:37.000000000 +0100 @@ -295,7 +295,7 @@ int do_rmdir(const char *file)
> return(0);
> }
>
> -int do_mknod(const char *file, int mode, int dev)
> +int do_mknod(const char *file, int mode, unsigned long long dev)
> {
> int err;
>
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share
> your opinions on IT & business topics through brief surveys - and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> User-mode-linux-devel mailing list
> User-mode-linux-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
--
Inform me of my mistakes, so I can add them to my list!
Paolo Giarrusso, aka Blaisorblade
http://www.user-mode-linux.org/~blaisorblade
Chiacchiera con i tuoi amici in tempo reale!
http://it.yahoo.com/mail_it/foot/*http://it.messenger.yahoo.com
next prev parent reply other threads:[~2007-01-23 8:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-22 20:13 [uml-devel] [PATCH] [UML] fix mknod Johannes Stezenbach
2007-01-22 20:13 ` Johannes Stezenbach
2007-01-23 8:02 ` Blaisorblade [this message]
2007-01-23 8:02 ` [uml-devel] " Blaisorblade
2007-01-23 13:17 ` Johannes Stezenbach
2007-01-23 13:17 ` Johannes Stezenbach
2007-01-23 22:33 ` Blaisorblade
2007-01-23 22:33 ` Blaisorblade
2007-01-25 4:31 ` Andrew Morton
2007-01-25 4:31 ` Andrew Morton
2007-01-26 18:49 ` Blaisorblade
2007-01-26 18:49 ` Blaisorblade
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200701230902.30715.blaisorblade@yahoo.it \
--to=blaisorblade@yahoo.it \
--cc=akpm@osdl.org \
--cc=jdike@karaya.com \
--cc=js@linuxtv.org \
--cc=linux-kernel@vger.kernel.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.