* [PATCH v2 4/8] drivers: use new capable_or functionality [not found] ` <20220502160030.131168-1-cgzones@googlemail.com> @ 2022-05-02 16:00 ` Christian Göttsche 2022-05-09 10:44 ` Jiri Slaby 2022-05-09 10:46 ` Hans Verkuil 2022-05-02 16:00 ` [PATCH v2 7/8] kernel/bpf: " Christian Göttsche 2022-05-02 16:00 ` [PATCH v2 8/8] net: " Christian Göttsche 2 siblings, 2 replies; 7+ messages in thread From: Christian Göttsche @ 2022-05-02 16:00 UTC (permalink / raw) To: selinux Cc: Hans Verkuil, Mauro Carvalho Chehab, David S. Miller, Jakub Kicinski, Paolo Abeni, Stefan Haberland, Jan Hoeppner, Heiko Carstens, Vasily Gorbik, Alexander Gordeev, Christian Borntraeger, Sven Schnelle, Serge Hallyn, Arnd Bergmann, Zhen Lei, Ondrej Zary, David Yang, Laurent Pinchart, Colin Ian King, Yang Guang, Julia Lawall, Greg Kroah-Hartman, Jiri Slaby, Du Cheng, Sebastian Andrzej Siewior, Pavel Skripkin, linux-media, linux-kernel, netdev, linux-s390, linux-security-module 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@googlemail.com> --- drivers/media/common/saa7146/saa7146_video.c | 2 +- drivers/media/pci/bt8xx/bttv-driver.c | 3 +-- drivers/media/pci/saa7134/saa7134-video.c | 3 +-- drivers/media/platform/nxp/fsl-viu.c | 2 +- drivers/media/test-drivers/vivid/vivid-vid-cap.c | 2 +- drivers/net/caif/caif_serial.c | 2 +- drivers/s390/block/dasd_eckd.c | 2 +- 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; -- 2.36.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 4/8] drivers: use new capable_or functionality 2022-05-02 16:00 ` [PATCH v2 4/8] drivers: use new capable_or functionality Christian Göttsche @ 2022-05-09 10:44 ` Jiri Slaby 2022-05-09 10:46 ` Hans Verkuil 1 sibling, 0 replies; 7+ messages in thread From: Jiri Slaby @ 2022-05-09 10:44 UTC (permalink / raw) To: Christian Göttsche, selinux Cc: Hans Verkuil, Mauro Carvalho Chehab, David S. Miller, Jakub Kicinski, Paolo Abeni, Stefan Haberland, Jan Hoeppner, Heiko Carstens, Vasily Gorbik, Alexander Gordeev, Christian Borntraeger, Sven Schnelle, Serge Hallyn, Arnd Bergmann, Zhen Lei, Ondrej Zary, David Yang, Laurent Pinchart, Colin Ian King, Yang Guang, Julia Lawall, Greg Kroah-Hartman, Du Cheng, Sebastian Andrzej Siewior, Pavel Skripkin, linux-media, linux-kernel, netdev, linux-s390, linux-security-module 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@googlemail.com> > --- > drivers/net/caif/caif_serial.c | 2 +- For the above: Reviewed-by: Jiri Slaby <jirislaby@kernel.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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 4/8] drivers: use new capable_or functionality 2022-05-02 16:00 ` [PATCH v2 4/8] drivers: use new capable_or functionality Christian Göttsche 2022-05-09 10:44 ` Jiri Slaby @ 2022-05-09 10:46 ` Hans Verkuil 1 sibling, 0 replies; 7+ messages in thread From: Hans Verkuil @ 2022-05-09 10:46 UTC (permalink / raw) To: Christian Göttsche, selinux Cc: Mauro Carvalho Chehab, David S. Miller, Jakub Kicinski, Paolo Abeni, Stefan Haberland, Jan Hoeppner, Heiko Carstens, Vasily Gorbik, Alexander Gordeev, Christian Borntraeger, Sven Schnelle, Serge Hallyn, Arnd Bergmann, Zhen Lei, Ondrej Zary, David Yang, Laurent Pinchart, Colin Ian King, Yang Guang, Julia Lawall, Greg Kroah-Hartman, Jiri Slaby, Du Cheng, Sebastian Andrzej Siewior, Pavel Skripkin, linux-media, linux-kernel, netdev, linux-s390, linux-security-module On 5/2/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@googlemail.com> > --- > drivers/media/common/saa7146/saa7146_video.c | 2 +- > drivers/media/pci/bt8xx/bttv-driver.c | 3 +-- > drivers/media/pci/saa7134/saa7134-video.c | 3 +-- > drivers/media/platform/nxp/fsl-viu.c | 2 +- > drivers/media/test-drivers/vivid/vivid-vid-cap.c | 2 +- For the media drivers: Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Regards, Hans > drivers/net/caif/caif_serial.c | 2 +- > drivers/s390/block/dasd_eckd.c | 2 +- > 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; > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 7/8] kernel/bpf: use new capable_or functionality [not found] ` <20220502160030.131168-1-cgzones@googlemail.com> 2022-05-02 16:00 ` [PATCH v2 4/8] drivers: use new capable_or functionality Christian Göttsche @ 2022-05-02 16:00 ` Christian Göttsche 2022-05-02 16:00 ` [PATCH v2 8/8] net: " Christian Göttsche 2 siblings, 0 replies; 7+ messages in thread From: Christian Göttsche @ 2022-05-02 16:00 UTC (permalink / raw) To: selinux Cc: Serge Hallyn, Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend, KP Singh, linux-security-module, linux-kernel, netdev, bpf Use the new added capable_or function in appropriate cases, where a task is required to have any of two capabilities. Signed-off-by: Christian Göttsche <cgzones@googlemail.com> --- kernel/bpf/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index cdaa1152436a..95a2cf3e78c9 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -2249,7 +2249,7 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr) !bpf_capable()) return -EPERM; - if (is_net_admin_prog_type(type) && !capable(CAP_NET_ADMIN) && !capable(CAP_SYS_ADMIN)) + if (is_net_admin_prog_type(type) && !capable_or(CAP_NET_ADMIN, CAP_SYS_ADMIN)) return -EPERM; if (is_perfmon_prog_type(type) && !perfmon_capable()) return -EPERM; -- 2.36.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 8/8] net: use new capable_or functionality [not found] ` <20220502160030.131168-1-cgzones@googlemail.com> 2022-05-02 16:00 ` [PATCH v2 4/8] drivers: use new capable_or functionality Christian Göttsche 2022-05-02 16:00 ` [PATCH v2 7/8] kernel/bpf: " Christian Göttsche @ 2022-05-02 16:00 ` Christian Göttsche 2022-05-09 17:15 ` Serge E. Hallyn 2 siblings, 1 reply; 7+ messages in thread From: Christian Göttsche @ 2022-05-02 16:00 UTC (permalink / raw) To: selinux Cc: Serge Hallyn, David S. Miller, Jakub Kicinski, Paolo Abeni, Florian Fainelli, Alexander Aring, Ziyang Xuan, Eric Dumazet, linux-security-module, linux-kernel, netdev 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@googlemail.com> --- net/caif/caif_socket.c | 2 +- net/unix/scm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 2b8892d502f7..60498148126c 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -1036,7 +1036,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol, .usersize = sizeof_field(struct caifsock, conn_req.param) }; - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_NET_ADMIN)) + if (!capable_or(CAP_NET_ADMIN, CAP_SYS_ADMIN)) return -EPERM; /* * The sock->type specifies the socket type to use. diff --git a/net/unix/scm.c b/net/unix/scm.c index aa27a02478dc..821be80e6c85 100644 --- a/net/unix/scm.c +++ b/net/unix/scm.c @@ -99,7 +99,7 @@ static inline bool too_many_unix_fds(struct task_struct *p) struct user_struct *user = current_user(); if (unlikely(user->unix_inflight > task_rlimit(p, RLIMIT_NOFILE))) - return !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN); + return !capable_or(CAP_SYS_RESOURCE, CAP_SYS_ADMIN); return false; } -- 2.36.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 8/8] net: use new capable_or functionality 2022-05-02 16:00 ` [PATCH v2 8/8] net: " Christian Göttsche @ 2022-05-09 17:15 ` Serge E. Hallyn 2022-05-22 17:33 ` Serge E. Hallyn 0 siblings, 1 reply; 7+ messages in thread From: Serge E. Hallyn @ 2022-05-09 17:15 UTC (permalink / raw) To: Christian Göttsche Cc: selinux, Serge Hallyn, David S. Miller, Jakub Kicinski, Paolo Abeni, Florian Fainelli, Alexander Aring, Ziyang Xuan, Eric Dumazet, linux-security-module, linux-kernel, netdev On Mon, May 02, 2022 at 06:00:29PM +0200, 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@googlemail.com> Thanks, for 2-8: Reviewed-by: Serge Hallyn <serge@hallyn.com> though I'd still like to talk about the name :) > --- > net/caif/caif_socket.c | 2 +- > net/unix/scm.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c > index 2b8892d502f7..60498148126c 100644 > --- a/net/caif/caif_socket.c > +++ b/net/caif/caif_socket.c > @@ -1036,7 +1036,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol, > .usersize = sizeof_field(struct caifsock, conn_req.param) > }; > > - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_NET_ADMIN)) > + if (!capable_or(CAP_NET_ADMIN, CAP_SYS_ADMIN)) > return -EPERM; > /* > * The sock->type specifies the socket type to use. > diff --git a/net/unix/scm.c b/net/unix/scm.c > index aa27a02478dc..821be80e6c85 100644 > --- a/net/unix/scm.c > +++ b/net/unix/scm.c > @@ -99,7 +99,7 @@ static inline bool too_many_unix_fds(struct task_struct *p) > struct user_struct *user = current_user(); > > if (unlikely(user->unix_inflight > task_rlimit(p, RLIMIT_NOFILE))) > - return !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN); > + return !capable_or(CAP_SYS_RESOURCE, CAP_SYS_ADMIN); > return false; > } > > -- > 2.36.0 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 8/8] net: use new capable_or functionality 2022-05-09 17:15 ` Serge E. Hallyn @ 2022-05-22 17:33 ` Serge E. Hallyn 0 siblings, 0 replies; 7+ messages in thread From: Serge E. Hallyn @ 2022-05-22 17:33 UTC (permalink / raw) To: Serge E. Hallyn Cc: Christian Göttsche, selinux, David S. Miller, Jakub Kicinski, Paolo Abeni, Florian Fainelli, Alexander Aring, Ziyang Xuan, Eric Dumazet, linux-security-module, linux-kernel, netdev On Mon, May 09, 2022 at 12:15:09PM -0500, Serge E. Hallyn wrote: > On Mon, May 02, 2022 at 06:00:29PM +0200, 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@googlemail.com> > > Thanks, for 2-8: > > Reviewed-by: Serge Hallyn <serge@hallyn.com> > > though I'd still like to talk about the name :) Just checking in - is this being discussed elsewhere? > > --- > > net/caif/caif_socket.c | 2 +- > > net/unix/scm.c | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c > > index 2b8892d502f7..60498148126c 100644 > > --- a/net/caif/caif_socket.c > > +++ b/net/caif/caif_socket.c > > @@ -1036,7 +1036,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol, > > .usersize = sizeof_field(struct caifsock, conn_req.param) > > }; > > > > - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_NET_ADMIN)) > > + if (!capable_or(CAP_NET_ADMIN, CAP_SYS_ADMIN)) > > return -EPERM; > > /* > > * The sock->type specifies the socket type to use. > > diff --git a/net/unix/scm.c b/net/unix/scm.c > > index aa27a02478dc..821be80e6c85 100644 > > --- a/net/unix/scm.c > > +++ b/net/unix/scm.c > > @@ -99,7 +99,7 @@ static inline bool too_many_unix_fds(struct task_struct *p) > > struct user_struct *user = current_user(); > > > > if (unlikely(user->unix_inflight > task_rlimit(p, RLIMIT_NOFILE))) > > - return !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN); > > + return !capable_or(CAP_SYS_RESOURCE, CAP_SYS_ADMIN); > > return false; > > } > > > > -- > > 2.36.0 ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-05-22 17:33 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20220217145003.78982-2-cgzones@googlemail.com>
[not found] ` <20220502160030.131168-1-cgzones@googlemail.com>
2022-05-02 16:00 ` [PATCH v2 4/8] drivers: use new capable_or functionality Christian Göttsche
2022-05-09 10:44 ` Jiri Slaby
2022-05-09 10:46 ` Hans Verkuil
2022-05-02 16:00 ` [PATCH v2 7/8] kernel/bpf: " Christian Göttsche
2022-05-02 16:00 ` [PATCH v2 8/8] net: " Christian Göttsche
2022-05-09 17:15 ` Serge E. Hallyn
2022-05-22 17:33 ` Serge E. Hallyn
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).