Re: [PATCH] remove suser()

Pavel Machek (pavel@ucw.cz)
Thu, 6 Jun 2002 23:48:40 +0200


Hi!

> Attached patch replaces the lone remaining suser() call with capable()
> and then removes suser() itself in a triumphant celebration of the glory
> of capable(). Or something. ;-)
>
> Small cleanup of capable() and some comments, too.
>
> Patch is against 2.5.20, please apply.
>
> Robert Love
>
> diff -urN linux-2.5.20/drivers/net/wan/pc300_drv.c linux/drivers/net/wan/pc300_drv.c
> --- linux-2.5.20/drivers/net/wan/pc300_drv.c Sun Jun 2 18:44:53 2002
> +++ linux/drivers/net/wan/pc300_drv.c Tue Jun 4 13:56:54 2002
> @@ -2564,7 +2564,7 @@
> return -EINVAL;
> return 0;
> case SIOCSPC300CONF:
> - if (!suser())
> + if (!capable(CAP_NET_ADMIN))
> return -EPERM;
> if (!arg ||
> copy_from_user(&conf_aux.conf, arg, sizeof(pc300chconf_t)))
> diff -urN linux-2.5.20/include/linux/compatmac.h linux/include/linux/compatmac.h
> --- linux-2.5.20/include/linux/compatmac.h Sun Jun 2 18:44:41 2002
> +++ linux/include/linux/compatmac.h Tue Jun 4 13:57:33 2002
> @@ -102,8 +102,6 @@
>
> #define my_iounmap(x, b) (((long)x<0x100000)?0:vfree ((void*)x))
>
> -#define capable(x) suser()
> -
> #define tty_flip_buffer_push(tty) queue_task(&tty->flip.tqueue, &tq_timer)

This is not right I believe. You want to keep compatibility for older
kernels.

Pavel

-- 
(about SSSCA) "I don't say this lightly.  However, I really think that the U.S.
no longer is classifiable as a democracy, but rather as a plutocracy." --hpa
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/