2004-11-28 14:26:58

by Mikael Pettersson

Subject: [PATCH][2.4.29-pre1] proc_tty.c warning fix

The /proc/tty/driver/serial vulnerability fix in 2.4.29-pre1
calls a function without a prototype in scope, resulting in:

proc_tty.c: In function `proc_tty_init':
proc_tty.c:183: warning: implicit declaration of function `proc_mkdir_mode'
proc_tty.c:183: warning: assignment makes pointer from integer without a cast

Fixed by the trivial patch below.

Signed-off-by: Mikael Pettersson <[email protected]>

--- linux-2.4.29-pre1/include/linux/proc_fs.h.~1~ 2004-11-28 12:54:26.000000000 +0100
+++ linux-2.4.29-pre1/include/linux/proc_fs.h 2004-11-28 13:44:05.000000000 +0100
@@ -143,6 +143,7 @@ extern struct proc_dir_entry *proc_symli
struct proc_dir_entry *, const char *);
extern struct proc_dir_entry *proc_mknod(const char *,mode_t,
struct proc_dir_entry *,kdev_t);
+extern struct proc_dir_entry *proc_mkdir_mode(const char *, mode_t, struct proc_dir_entry *);
extern struct proc_dir_entry *proc_mkdir(const char *,struct proc_dir_entry *);

static inline struct proc_dir_entry *create_proc_read_entry(const char *name,

2004-11-30 02:26:06

by Chris Wright

Subject: Re: [PATCH][2.4.29-pre1] proc_tty.c warning fix

* Mikael Pettersson ([email protected]) wrote:
> The /proc/tty/driver/serial vulnerability fix in 2.4.29-pre1
> calls a function without a prototype in scope, resulting in:
>
> proc_tty.c: In function `proc_tty_init':
> proc_tty.c:183: warning: implicit declaration of function `proc_mkdir_mode'
> proc_tty.c:183: warning: assignment makes pointer from integer without a cast
>
> Fixed by the trivial patch below.
>
> Signed-off-by: Mikael Pettersson <[email protected]>

Yes, oversight, please apply. Well, here's an insignificant variation
which comes straight from 2.6 to minimize divergence.

===== include/linux/proc_fs.h 1.10 vs edited =====
--- 1.10/include/linux/proc_fs.h 2004-10-05 11:22:37 -07:00
+++ edited/include/linux/proc_fs.h 2004-11-29 18:17:37 -08:00
@@ -144,6 +144,8 @@ extern struct proc_dir_entry *proc_symli
extern struct proc_dir_entry *proc_mknod(const char *,mode_t,
struct proc_dir_entry *,kdev_t);
extern struct proc_dir_entry *proc_mkdir(const char *,struct proc_dir_entry *);
+extern struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode,
+ struct proc_dir_entry *parent);

static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
mode_t mode, struct proc_dir_entry *base,