lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 9 May 2022 12:44:08 +0200 From: Jiri Slaby <jirislaby@...nel.org> To: Christian Göttsche <cgzones@...glemail.com>, selinux@...r.kernel.org Cc: Hans Verkuil <hverkuil@...all.nl>, Mauro Carvalho Chehab <mchehab@...nel.org>, "David S. Miller" <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Stefan Haberland <sth@...ux.ibm.com>, Jan Hoeppner <hoeppner@...ux.ibm.com>, Heiko Carstens <hca@...ux.ibm.com>, Vasily Gorbik <gor@...ux.ibm.com>, Alexander Gordeev <agordeev@...ux.ibm.com>, Christian Borntraeger <borntraeger@...ux.ibm.com>, Sven Schnelle <svens@...ux.ibm.com>, Serge Hallyn <serge@...lyn.com>, Arnd Bergmann <arnd@...db.de>, Zhen Lei <thunder.leizhen@...wei.com>, Ondrej Zary <linux@...y.sk>, David Yang <davidcomponentone@...il.com>, Laurent Pinchart <laurent.pinchart@...asonboard.com>, Colin Ian King <colin.king@...el.com>, Yang Guang <yang.guang5@....com.cn>, Julia Lawall <Julia.Lawall@...ia.fr>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Du Cheng <ducheng2@...il.com>, Sebastian Andrzej Siewior <bigeasy@...utronix.de>, Pavel Skripkin <paskripkin@...il.com>, linux-media@...r.kernel.org, linux-kernel@...r.kernel.org, netdev@...r.kernel.org, linux-s390@...r.kernel.org, linux-security-module@...r.kernel.org Subject: Re: [PATCH v2 4/8] drivers: use new capable_or functionality On 02. 05. 22, 18:00, Christian Göttsche wrote: > Use the new added capable_or function in appropriate cases, where a task > is required to have any of two capabilities. > > Reorder CAP_SYS_ADMIN last. > > Signed-off-by: Christian Göttsche <cgzones@...glemail.com> > --- > drivers/net/caif/caif_serial.c | 2 +- For the above: Reviewed-by: Jiri Slaby <jirislaby@...nel.org> > 7 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/drivers/media/common/saa7146/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c > index 66215d9106a4..5eabc2e77cc2 100644 > --- a/drivers/media/common/saa7146/saa7146_video.c > +++ b/drivers/media/common/saa7146/saa7146_video.c > @@ -470,7 +470,7 @@ static int vidioc_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuf > > DEB_EE("VIDIOC_S_FBUF\n"); > > - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RAWIO)) > + if (!capable_or(CAP_SYS_RAWIO, CAP_SYS_ADMIN)) > return -EPERM; > > /* check args */ > diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c > index 5ca3d0cc653a..4143f380d44d 100644 > --- a/drivers/media/pci/bt8xx/bttv-driver.c > +++ b/drivers/media/pci/bt8xx/bttv-driver.c > @@ -2569,8 +2569,7 @@ static int bttv_s_fbuf(struct file *file, void *f, > const struct bttv_format *fmt; > int retval; > > - if (!capable(CAP_SYS_ADMIN) && > - !capable(CAP_SYS_RAWIO)) > + if (!capable_or(CAP_SYS_RAWIO, CAP_SYS_ADMIN)) > return -EPERM; > > /* check args */ > diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c > index 48543ad3d595..684208ebfdbd 100644 > --- a/drivers/media/pci/saa7134/saa7134-video.c > +++ b/drivers/media/pci/saa7134/saa7134-video.c > @@ -1798,8 +1798,7 @@ static int saa7134_s_fbuf(struct file *file, void *f, > struct saa7134_dev *dev = video_drvdata(file); > struct saa7134_format *fmt; > > - if (!capable(CAP_SYS_ADMIN) && > - !capable(CAP_SYS_RAWIO)) > + if (!capable_or(CAP_SYS_RAWIO, CAP_SYS_ADMIN)) > return -EPERM; > > /* check args */ > diff --git a/drivers/media/platform/nxp/fsl-viu.c b/drivers/media/platform/nxp/fsl-viu.c > index afc96f6db2a1..c5ed4c4a1587 100644 > --- a/drivers/media/platform/nxp/fsl-viu.c > +++ b/drivers/media/platform/nxp/fsl-viu.c > @@ -803,7 +803,7 @@ static int vidioc_s_fbuf(struct file *file, void *priv, const struct v4l2_frameb > const struct v4l2_framebuffer *fb = arg; > struct viu_fmt *fmt; > > - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RAWIO)) > + if (!capable_or(CAP_SYS_RAWIO, CAP_SYS_ADMIN)) > return -EPERM; > > /* check args */ > diff --git a/drivers/media/test-drivers/vivid/vivid-vid-cap.c b/drivers/media/test-drivers/vivid/vivid-vid-cap.c > index b9caa4b26209..a0cfcf6c22c4 100644 > --- a/drivers/media/test-drivers/vivid/vivid-vid-cap.c > +++ b/drivers/media/test-drivers/vivid/vivid-vid-cap.c > @@ -1253,7 +1253,7 @@ int vivid_vid_cap_s_fbuf(struct file *file, void *fh, > if (dev->multiplanar) > return -ENOTTY; > > - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RAWIO)) > + if (!capable_or(CAP_SYS_RAWIO, CAP_SYS_ADMIN)) > return -EPERM; > > if (dev->overlay_cap_owner) > diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c > index 688075859ae4..f17b618d8858 100644 > --- a/drivers/net/caif/caif_serial.c > +++ b/drivers/net/caif/caif_serial.c > @@ -326,7 +326,7 @@ static int ldisc_open(struct tty_struct *tty) > /* No write no play */ > if (tty->ops->write == NULL) > return -EOPNOTSUPP; > - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_TTY_CONFIG)) > + if (!capable_or(CAP_SYS_TTY_CONFIG, CAP_SYS_ADMIN)) > return -EPERM; > > /* release devices to avoid name collision */ > diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c > index 8410a25a65c1..9b5d22dd3e7b 100644 > --- a/drivers/s390/block/dasd_eckd.c > +++ b/drivers/s390/block/dasd_eckd.c > @@ -5319,7 +5319,7 @@ static int dasd_symm_io(struct dasd_device *device, void __user *argp) > char psf0, psf1; > int rc; > > - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RAWIO)) > + if (!capable_or(CAP_SYS_RAWIO, CAP_SYS_ADMIN)) > return -EACCES; > psf0 = psf1 = 0; > -- js suse labs
Powered by blists - more mailing lists