Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 321671
b: refs/heads/master
c: 800fb3d
h: refs/heads/master
i:
  321669: 7c00fb3
  321667: 560f758
  321663: a7b5d5d
v: v3
  • Loading branch information
Mike Frysinger authored and Paul Mundt committed Aug 9, 2012
1 parent 187cfe6 commit 5003416
Show file tree
Hide file tree
Showing 189 changed files with 739 additions and 3,047 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1dd8372d350583b0acc8d7cfd7a1dee05e1942dc
refs/heads/master: 800fb3ddee2c50918d651fbd70515f1e38857305
14 changes: 7 additions & 7 deletions trunk/Documentation/security/Yama.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,27 +46,27 @@ restrictions, it can call prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY, ...)
so that any otherwise allowed process (even those in external pid namespaces)
may attach.

The sysctl settings (writable only with CAP_SYS_PTRACE) are:
These restrictions do not change how ptrace via PTRACE_TRACEME operates.

The sysctl settings are:

0 - classic ptrace permissions: a process can PTRACE_ATTACH to any other
process running under the same uid, as long as it is dumpable (i.e.
did not transition uids, start privileged, or have called
prctl(PR_SET_DUMPABLE...) already). Similarly, PTRACE_TRACEME is
unchanged.
prctl(PR_SET_DUMPABLE...) already).

1 - restricted ptrace: a process must have a predefined relationship
with the inferior it wants to call PTRACE_ATTACH on. By default,
this relationship is that of only its descendants when the above
classic criteria is also met. To change the relationship, an
inferior can call prctl(PR_SET_PTRACER, debugger, ...) to declare
an allowed debugger PID to call PTRACE_ATTACH on the inferior.
Using PTRACE_TRACEME is unchanged.

2 - admin-only attach: only processes with CAP_SYS_PTRACE may use ptrace
with PTRACE_ATTACH, or through children calling PTRACE_TRACEME.
with PTRACE_ATTACH.

3 - no attach: no processes may use ptrace with PTRACE_ATTACH nor via
PTRACE_TRACEME. Once set, this sysctl value cannot be changed.
3 - no attach: no processes may use ptrace with PTRACE_ATTACH. Once set,
this sysctl cannot be changed to a lower value.

The original children-only logic was based on the restrictions in grsecurity.

Expand Down
42 changes: 19 additions & 23 deletions trunk/MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -827,24 +827,24 @@ F: arch/arm/mach-pxa/colibri-pxa270-income.c

ARM/INTEL IOP32X ARM ARCHITECTURE
M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <djbw@fb.com>
M: Dan Williams <dan.j.williams@intel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained

ARM/INTEL IOP33X ARM ARCHITECTURE
M: Dan Williams <djbw@fb.com>
M: Dan Williams <dan.j.williams@intel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained

ARM/INTEL IOP13XX ARM ARCHITECTURE
M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <djbw@fb.com>
M: Dan Williams <dan.j.williams@intel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained

ARM/INTEL IQ81342EX MACHINE SUPPORT
M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <djbw@fb.com>
M: Dan Williams <dan.j.williams@intel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained

Expand All @@ -869,7 +869,7 @@ F: drivers/pcmcia/pxa2xx_stargate2.c

ARM/INTEL XSC3 (MANZANO) ARM CORE
M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <djbw@fb.com>
M: Dan Williams <dan.j.williams@intel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained

Expand Down Expand Up @@ -925,14 +925,14 @@ S: Maintained

ARM/NOMADIK ARCHITECTURE
M: Alessandro Rubini <rubini@unipv.it>
M: Linus Walleij <linus.walleij@linaro.org>
M: Linus Walleij <linus.walleij@stericsson.com>
M: STEricsson <STEricsson_nomadik_linux@list.st.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: arch/arm/mach-nomadik/
F: arch/arm/plat-nomadik/
F: drivers/i2c/busses/i2c-nomadik.c
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git

ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
M: Nelson Castillo <arhuaco@freaks-unidos.net>
Expand Down Expand Up @@ -1146,7 +1146,7 @@ F: drivers/usb/host/ehci-w90x900.c
F: drivers/video/nuc900fb.c

ARM/U300 MACHINE SUPPORT
M: Linus Walleij <linus.walleij@linaro.org>
M: Linus Walleij <linus.walleij@stericsson.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Supported
F: arch/arm/mach-u300/
Expand All @@ -1161,20 +1161,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git

ARM/Ux500 ARM ARCHITECTURE
M: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
M: Linus Walleij <linus.walleij@linaro.org>
M: Linus Walleij <linus.walleij@stericsson.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: arch/arm/mach-ux500/
F: drivers/clocksource/clksrc-dbx500-prcmu.c
F: drivers/dma/ste_dma40*
F: drivers/hwspinlock/u8500_hsem.c
F: drivers/mfd/abx500*
F: drivers/mfd/ab8500*
F: drivers/mfd/dbx500*
F: drivers/mfd/db8500*
F: drivers/pinctrl/pinctrl-nomadik*
F: drivers/mfd/stmpe*
F: drivers/rtc/rtc-ab8500.c
F: drivers/rtc/rtc-pl031.c
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git

ARM/VFP SUPPORT
Expand Down Expand Up @@ -1232,9 +1227,9 @@ S: Maintained
F: drivers/hwmon/asb100.c

ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
M: Dan Williams <djbw@fb.com>
M: Dan Williams <dan.j.williams@intel.com>
W: http://sourceforge.net/projects/xscaleiop
S: Maintained
S: Supported
F: Documentation/crypto/async-tx-api.txt
F: crypto/async_tx/
F: drivers/dma/
Expand Down Expand Up @@ -2364,7 +2359,7 @@ T: git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git

DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
M: Vinod Koul <vinod.koul@intel.com>
M: Dan Williams <djbw@fb.com>
M: Dan Williams <dan.j.williams@intel.com>
S: Supported
F: drivers/dma/
F: include/linux/dma*
Expand Down Expand Up @@ -3099,7 +3094,7 @@ F: include/linux/gigaset_dev.h

GPIO SUBSYSTEM
M: Grant Likely <grant.likely@secretlab.ca>
M: Linus Walleij <linus.walleij@linaro.org>
M: Linus Walleij <linus.walleij@stericsson.com>
S: Maintained
T: git git://git.secretlab.ca/git/linux-2.6.git
F: Documentation/gpio.txt
Expand Down Expand Up @@ -3552,6 +3547,7 @@ K: \b(ABS|SYN)_MT_

INTEL C600 SERIES SAS CONTROLLER DRIVER
M: Intel SCU Linux support <intel-linux-scu@intel.com>
M: Dan Williams <dan.j.williams@intel.com>
M: Dave Jiang <dave.jiang@intel.com>
M: Ed Nadolski <edmund.nadolski@intel.com>
L: linux-scsi@vger.kernel.org
Expand Down Expand Up @@ -3594,8 +3590,8 @@ F: arch/x86/kernel/microcode_core.c
F: arch/x86/kernel/microcode_intel.c

INTEL I/OAT DMA DRIVER
M: Dan Williams <djbw@fb.com>
S: Maintained
M: Dan Williams <dan.j.williams@intel.com>
S: Supported
F: drivers/dma/ioat*

INTEL IOMMU (VT-d)
Expand All @@ -3607,8 +3603,8 @@ F: drivers/iommu/intel-iommu.c
F: include/linux/intel-iommu.h

INTEL IOP-ADMA DMA DRIVER
M: Dan Williams <djbw@fb.com>
S: Odd fixes
M: Dan Williams <dan.j.williams@intel.com>
S: Maintained
F: drivers/dma/iop-adma.c

INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
Expand Down
52 changes: 26 additions & 26 deletions trunk/arch/arm/boot/dts/imx23.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,19 @@

dma-apbh@80004000 {
compatible = "fsl,imx23-dma-apbh";
reg = <0x80004000 0x2000>;
reg = <0x80004000 2000>;
};

ecc@80008000 {
reg = <0x80008000 0x2000>;
reg = <0x80008000 2000>;
status = "disabled";
};

gpmi-nand@8000c000 {
compatible = "fsl,imx23-gpmi-nand";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
reg = <0x8000c000 2000>, <0x8000a000 2000>;
reg-names = "gpmi-nand", "bch";
interrupts = <13>, <56>;
interrupt-names = "gpmi-dma", "bch";
Expand All @@ -72,22 +72,22 @@
};

ssp0: ssp@80010000 {
reg = <0x80010000 0x2000>;
reg = <0x80010000 2000>;
interrupts = <15 14>;
fsl,ssp-dma-channel = <1>;
status = "disabled";
};

etm@80014000 {
reg = <0x80014000 0x2000>;
reg = <0x80014000 2000>;
status = "disabled";
};

pinctrl@80018000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx23-pinctrl", "simple-bus";
reg = <0x80018000 0x2000>;
reg = <0x80018000 2000>;

gpio0: gpio@0 {
compatible = "fsl,imx23-gpio", "fsl,mxs-gpio";
Expand Down Expand Up @@ -273,32 +273,32 @@
};

emi@80020000 {
reg = <0x80020000 0x2000>;
reg = <0x80020000 2000>;
status = "disabled";
};

dma-apbx@80024000 {
compatible = "fsl,imx23-dma-apbx";
reg = <0x80024000 0x2000>;
reg = <0x80024000 2000>;
};

dcp@80028000 {
reg = <0x80028000 0x2000>;
reg = <0x80028000 2000>;
status = "disabled";
};

pxp@8002a000 {
reg = <0x8002a000 0x2000>;
reg = <0x8002a000 2000>;
status = "disabled";
};

ocotp@8002c000 {
reg = <0x8002c000 0x2000>;
reg = <0x8002c000 2000>;
status = "disabled";
};

axi-ahb@8002e000 {
reg = <0x8002e000 0x2000>;
reg = <0x8002e000 2000>;
status = "disabled";
};

Expand All @@ -310,14 +310,14 @@
};

ssp1: ssp@80034000 {
reg = <0x80034000 0x2000>;
reg = <0x80034000 2000>;
interrupts = <2 20>;
fsl,ssp-dma-channel = <2>;
status = "disabled";
};

tvenc@80038000 {
reg = <0x80038000 0x2000>;
reg = <0x80038000 2000>;
status = "disabled";
};
};
Expand All @@ -330,37 +330,37 @@
ranges;

clkctl@80040000 {
reg = <0x80040000 0x2000>;
reg = <0x80040000 2000>;
status = "disabled";
};

saif0: saif@80042000 {
reg = <0x80042000 0x2000>;
reg = <0x80042000 2000>;
status = "disabled";
};

power@80044000 {
reg = <0x80044000 0x2000>;
reg = <0x80044000 2000>;
status = "disabled";
};

saif1: saif@80046000 {
reg = <0x80046000 0x2000>;
reg = <0x80046000 2000>;
status = "disabled";
};

audio-out@80048000 {
reg = <0x80048000 0x2000>;
reg = <0x80048000 2000>;
status = "disabled";
};

audio-in@8004c000 {
reg = <0x8004c000 0x2000>;
reg = <0x8004c000 2000>;
status = "disabled";
};

lradc@80050000 {
reg = <0x80050000 0x2000>;
reg = <0x80050000 2000>;
status = "disabled";
};

Expand All @@ -370,26 +370,26 @@
};

i2c@80058000 {
reg = <0x80058000 0x2000>;
reg = <0x80058000 2000>;
status = "disabled";
};

rtc@8005c000 {
compatible = "fsl,imx23-rtc", "fsl,stmp3xxx-rtc";
reg = <0x8005c000 0x2000>;
reg = <0x8005c000 2000>;
interrupts = <22>;
};

pwm: pwm@80064000 {
compatible = "fsl,imx23-pwm";
reg = <0x80064000 0x2000>;
reg = <0x80064000 2000>;
#pwm-cells = <2>;
fsl,pwm-number = <5>;
status = "disabled";
};

timrot@80068000 {
reg = <0x80068000 0x2000>;
reg = <0x80068000 2000>;
status = "disabled";
};

Expand Down Expand Up @@ -429,7 +429,7 @@
ranges;

usbctrl@80080000 {
reg = <0x80080000 0x40000>;
reg = <0x80080000 0x10000>;
status = "disabled";
};
};
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/boot/dts/imx27-3ds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
status = "okay";
};

uart1: serial@1000a000 {
uart@1000a000 {
fsl,uart-has-rtscts;
status = "okay";
};
Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/arm/boot/dts/imx27.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
serial3 = &uart4;
serial4 = &uart5;
serial5 = &uart6;
gpio0 = &gpio1;
gpio1 = &gpio2;
gpio2 = &gpio3;
gpio3 = &gpio4;
gpio4 = &gpio5;
gpio5 = &gpio6;
};

avic: avic-interrupt-controller@e0000000 {
Expand Down
Loading

0 comments on commit 5003416

Please sign in to comment.