* Re: mmotm 2020-01-28-20-05 uploaded (security/security.c) [not found] <20200129040640.6PNuz0vcp%akpm@linux-foundation.org> @ 2020-01-29 4:52 ` Randy Dunlap 2020-01-29 13:51 ` Paul Moore 2020-01-29 22:32 ` Stephen Rothwell 0 siblings, 2 replies; 4+ messages in thread From: Randy Dunlap @ 2020-01-29 4:52 UTC (permalink / raw) To: akpm, broonie, linux-fsdevel, linux-kernel, linux-mm, linux-next, mhocko, mm-commits, sfr, linux-security-module, James Morris, Serge E. Hallyn On 1/28/20 8:06 PM, akpm@linux-foundation.org wrote: > The mm-of-the-moment snapshot 2020-01-28-20-05 has been uploaded to > > http://www.ozlabs.org/~akpm/mmotm/ > > mmotm-readme.txt says > > README for mm-of-the-moment: > > http://www.ozlabs.org/~akpm/mmotm/ > > This is a snapshot of my -mm patch queue. Uploaded at random hopefully > more than once a week. > security/security.c contains duplicate lines for <lockdown_reasons> array: /* * These are descriptions of the reasons that can be passed to the * security_locked_down() LSM hook. Placing this array here allows * all security modules to use the same descriptions for auditing * purposes. */ const char *const lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1] = { [LOCKDOWN_NONE] = "none", [LOCKDOWN_MODULE_SIGNATURE] = "unsigned module loading", [LOCKDOWN_DEV_MEM] = "/dev/mem,kmem,port", [LOCKDOWN_EFI_TEST] = "/dev/efi_test access", [LOCKDOWN_KEXEC] = "kexec of unsigned images", [LOCKDOWN_HIBERNATION] = "hibernation", [LOCKDOWN_PCI_ACCESS] = "direct PCI access", [LOCKDOWN_IOPORT] = "raw io port access", [LOCKDOWN_MSR] = "raw MSR access", [LOCKDOWN_ACPI_TABLES] = "modifying ACPI tables", [LOCKDOWN_PCMCIA_CIS] = "direct PCMCIA CIS storage", [LOCKDOWN_TIOCSSERIAL] = "reconfiguration of serial port IO", [LOCKDOWN_MODULE_PARAMETERS] = "unsafe module parameters", [LOCKDOWN_MMIOTRACE] = "unsafe mmio", [LOCKDOWN_DEBUGFS] = "debugfs access", [LOCKDOWN_XMON_WR] = "xmon write access", [LOCKDOWN_INTEGRITY_MAX] = "integrity", [LOCKDOWN_KCORE] = "/proc/kcore access", [LOCKDOWN_KPROBES] = "use of kprobes", [LOCKDOWN_BPF_READ] = "use of bpf to read kernel RAM", [LOCKDOWN_PERF] = "unsafe use of perf", [LOCKDOWN_TRACEFS] = "use of tracefs", [LOCKDOWN_XMON_RW] = "xmon read and write access", [LOCKDOWN_CONFIDENTIALITY_MAX] = "confidentiality", }; /* * These are descriptions of the reasons that can be passed to the * security_locked_down() LSM hook. Placing this array here allows * all security modules to use the same descriptions for auditing * purposes. */ const char *const lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1] = { [LOCKDOWN_NONE] = "none", [LOCKDOWN_MODULE_SIGNATURE] = "unsigned module loading", [LOCKDOWN_DEV_MEM] = "/dev/mem,kmem,port", [LOCKDOWN_EFI_TEST] = "/dev/efi_test access", [LOCKDOWN_KEXEC] = "kexec of unsigned images", [LOCKDOWN_HIBERNATION] = "hibernation", [LOCKDOWN_PCI_ACCESS] = "direct PCI access", [LOCKDOWN_IOPORT] = "raw io port access", [LOCKDOWN_MSR] = "raw MSR access", [LOCKDOWN_ACPI_TABLES] = "modifying ACPI tables", [LOCKDOWN_PCMCIA_CIS] = "direct PCMCIA CIS storage", [LOCKDOWN_TIOCSSERIAL] = "reconfiguration of serial port IO", [LOCKDOWN_MODULE_PARAMETERS] = "unsafe module parameters", [LOCKDOWN_MMIOTRACE] = "unsafe mmio", [LOCKDOWN_DEBUGFS] = "debugfs access", [LOCKDOWN_XMON_WR] = "xmon write access", [LOCKDOWN_INTEGRITY_MAX] = "integrity", [LOCKDOWN_KCORE] = "/proc/kcore access", [LOCKDOWN_KPROBES] = "use of kprobes", [LOCKDOWN_BPF_READ] = "use of bpf to read kernel RAM", [LOCKDOWN_PERF] = "unsafe use of perf", [LOCKDOWN_TRACEFS] = "use of tracefs", [LOCKDOWN_XMON_RW] = "xmon read and write access", [LOCKDOWN_CONFIDENTIALITY_MAX] = "confidentiality", }; Stephen, you might delete half of those for linux-next.... -- ~Randy ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: mmotm 2020-01-28-20-05 uploaded (security/security.c) 2020-01-29 4:52 ` mmotm 2020-01-28-20-05 uploaded (security/security.c) Randy Dunlap @ 2020-01-29 13:51 ` Paul Moore 2020-01-29 16:02 ` Randy Dunlap 2020-01-29 22:32 ` Stephen Rothwell 1 sibling, 1 reply; 4+ messages in thread From: Paul Moore @ 2020-01-29 13:51 UTC (permalink / raw) To: Randy Dunlap Cc: akpm, broonie, linux-fsdevel, linux-kernel, linux-mm, linux-next, mhocko, mm-commits, sfr, linux-security-module, James Morris, Serge E. Hallyn On Tue, Jan 28, 2020 at 11:52 PM Randy Dunlap <rdunlap@infradead.org> wrote: > On 1/28/20 8:06 PM, akpm@linux-foundation.org wrote: > > The mm-of-the-moment snapshot 2020-01-28-20-05 has been uploaded to > > > > http://www.ozlabs.org/~akpm/mmotm/ > > > > mmotm-readme.txt says > > > > README for mm-of-the-moment: > > > > http://www.ozlabs.org/~akpm/mmotm/ > > > > This is a snapshot of my -mm patch queue. Uploaded at random hopefully > > more than once a week. > > > > security/security.c contains duplicate lines for <lockdown_reasons> array: Hmmm. Commit 59438b46471a ("security,lockdown,selinux: implement SELinux lockdown"), which was merged into Linus' tree during the current merge window, moved the lockdown_reasons array from security/lockdown/lockdown.c to security/security.c; is there another tree in linux-next which is moving lockdown_reasons into security/security.c? -- paul moore www.paul-moore.com ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: mmotm 2020-01-28-20-05 uploaded (security/security.c) 2020-01-29 13:51 ` Paul Moore @ 2020-01-29 16:02 ` Randy Dunlap 0 siblings, 0 replies; 4+ messages in thread From: Randy Dunlap @ 2020-01-29 16:02 UTC (permalink / raw) To: Paul Moore Cc: akpm, broonie, linux-fsdevel, linux-kernel, linux-mm, linux-next, mhocko, mm-commits, sfr, linux-security-module, James Morris, Serge E. Hallyn On 1/29/20 5:51 AM, Paul Moore wrote: > On Tue, Jan 28, 2020 at 11:52 PM Randy Dunlap <rdunlap@infradead.org> wrote: >> On 1/28/20 8:06 PM, akpm@linux-foundation.org wrote: >>> The mm-of-the-moment snapshot 2020-01-28-20-05 has been uploaded to >>> >>> http://www.ozlabs.org/~akpm/mmotm/ >>> >>> mmotm-readme.txt says >>> >>> README for mm-of-the-moment: >>> >>> http://www.ozlabs.org/~akpm/mmotm/ >>> >>> This is a snapshot of my -mm patch queue. Uploaded at random hopefully >>> more than once a week. >>> >> >> security/security.c contains duplicate lines for <lockdown_reasons> array: > > Hmmm. Commit 59438b46471a ("security,lockdown,selinux: implement > SELinux lockdown"), which was merged into Linus' tree during the > current merge window, moved the lockdown_reasons array from > security/lockdown/lockdown.c to security/security.c; is there another > tree in linux-next which is moving lockdown_reasons into > security/security.c? > Somehow in mmotm those lines of code were merged 2x: once from origin.patch and once from linux-next.patch. Looks more like a mmotm merge issue, not a security/ issue. -- ~Randy ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: mmotm 2020-01-28-20-05 uploaded (security/security.c) 2020-01-29 4:52 ` mmotm 2020-01-28-20-05 uploaded (security/security.c) Randy Dunlap 2020-01-29 13:51 ` Paul Moore @ 2020-01-29 22:32 ` Stephen Rothwell 1 sibling, 0 replies; 4+ messages in thread From: Stephen Rothwell @ 2020-01-29 22:32 UTC (permalink / raw) To: Randy Dunlap Cc: akpm, broonie, linux-fsdevel, linux-kernel, linux-mm, linux-next, mhocko, mm-commits, linux-security-module, James Morris, Serge E. Hallyn [-- Attachment #1: Type: text/plain, Size: 478 bytes --] Hi Randy, On Tue, 28 Jan 2020 20:52:28 -0800 Randy Dunlap <rdunlap@infradead.org> wrote: > > security/security.c contains duplicate lines for <lockdown_reasons> array: > > Stephen, you might delete half of those for linux-next.... I did not get that in my import of mmotm today. But I actually git merge the appropriate part of linux-next rather than applying the linux-next.patch from mmotm - so that may have taken care of it. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-29 22:33 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <20200129040640.6PNuz0vcp%akpm@linux-foundation.org> 2020-01-29 4:52 ` mmotm 2020-01-28-20-05 uploaded (security/security.c) Randy Dunlap 2020-01-29 13:51 ` Paul Moore 2020-01-29 16:02 ` Randy Dunlap 2020-01-29 22:32 ` Stephen Rothwell
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).