Skip to content

Commit 9b17c16

Browse files
olofjolofj
committed
Merge tag 'omap-for-v3.13/intc-ldp-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren: Fix a regression for wrong interrupt numbers for some devices after the sparse IRQ conversion, fix DRA7 console output for earlyprintk, and fix the LDP LCD backlight when DSS is built into the kernel and not as a loadable module. * tag 'omap-for-v3.13/intc-ldp-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Fix LCD panel backlight regression for LDP legacy booting ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL + v3.13-rc5 Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents 4cff612 + 82f4fe7 commit 9b17c16

File tree

217 files changed

+2035
-1092
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+2035
-1092
lines changed

‎Documentation/module-signing.txt

Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,240 @@
1+
==============================
2+
KERNEL MODULE SIGNING FACILITY
3+
==============================
4+
5+
CONTENTS
6+
7+
- Overview.
8+
- Configuring module signing.
9+
- Generating signing keys.
10+
- Public keys in the kernel.
11+
- Manually signing modules.
12+
- Signed modules and stripping.
13+
- Loading signed modules.
14+
- Non-valid signatures and unsigned modules.
15+
- Administering/protecting the private key.
16+
17+
18+
========
19+
OVERVIEW
20+
========
21+
22+
The kernel module signing facility cryptographically signs modules during
23+
installation and then checks the signature upon loading the module. This
24+
allows increased kernel security by disallowing the loading of unsigned modules
25+
or modules signed with an invalid key. Module signing increases security by
26+
making it harder to load a malicious module into the kernel. The module
27+
signature checking is done by the kernel so that it is not necessary to have
28+
trusted userspace bits.
29+
30+
This facility uses X.509 ITU-T standard certificates to encode the public keys
31+
involved. The signatures are not themselves encoded in any industrial standard
32+
type. The facility currently only supports the RSA public key encryption
33+
standard (though it is pluggable and permits others to be used). The possible
34+
hash algorithms that can be used are SHA-1, SHA-224, SHA-256, SHA-384, and
35+
SHA-512 (the algorithm is selected by data in the signature).
36+
37+
38+
==========================
39+
CONFIGURING MODULE SIGNING
40+
==========================
41+
42+
The module signing facility is enabled by going to the "Enable Loadable Module
43+
Support" section of the kernel configuration and turning on
44+
45+
CONFIG_MODULE_SIG "Module signature verification"
46+
47+
This has a number of options available:
48+
49+
(1) "Require modules to be validly signed" (CONFIG_MODULE_SIG_FORCE)
50+
51+
This specifies how the kernel should deal with a module that has a
52+
signature for which the key is not known or a module that is unsigned.
53+
54+
If this is off (ie. "permissive"), then modules for which the key is not
55+
available and modules that are unsigned are permitted, but the kernel will
56+
be marked as being tainted.
57+
58+
If this is on (ie. "restrictive"), only modules that have a valid
59+
signature that can be verified by a public key in the kernel's possession
60+
will be loaded. All other modules will generate an error.
61+
62+
Irrespective of the setting here, if the module has a signature block that
63+
cannot be parsed, it will be rejected out of hand.
64+
65+
66+
(2) "Automatically sign all modules" (CONFIG_MODULE_SIG_ALL)
67+
68+
If this is on then modules will be automatically signed during the
69+
modules_install phase of a build. If this is off, then the modules must
70+
be signed manually using:
71+
72+
scripts/sign-file
73+
74+
75+
(3) "Which hash algorithm should modules be signed with?"
76+
77+
This presents a choice of which hash algorithm the installation phase will
78+
sign the modules with:
79+
80+
CONFIG_SIG_SHA1 "Sign modules with SHA-1"
81+
CONFIG_SIG_SHA224 "Sign modules with SHA-224"
82+
CONFIG_SIG_SHA256 "Sign modules with SHA-256"
83+
CONFIG_SIG_SHA384 "Sign modules with SHA-384"
84+
CONFIG_SIG_SHA512 "Sign modules with SHA-512"
85+
86+
The algorithm selected here will also be built into the kernel (rather
87+
than being a module) so that modules signed with that algorithm can have
88+
their signatures checked without causing a dependency loop.
89+
90+
91+
=======================
92+
GENERATING SIGNING KEYS
93+
=======================
94+
95+
Cryptographic keypairs are required to generate and check signatures. A
96+
private key is used to generate a signature and the corresponding public key is
97+
used to check it. The private key is only needed during the build, after which
98+
it can be deleted or stored securely. The public key gets built into the
99+
kernel so that it can be used to check the signatures as the modules are
100+
loaded.
101+
102+
Under normal conditions, the kernel build will automatically generate a new
103+
keypair using openssl if one does not exist in the files:
104+
105+
signing_key.priv
106+
signing_key.x509
107+
108+
during the building of vmlinux (the public part of the key needs to be built
109+
into vmlinux) using parameters in the:
110+
111+
x509.genkey
112+
113+
file (which is also generated if it does not already exist).
114+
115+
It is strongly recommended that you provide your own x509.genkey file.
116+
117+
Most notably, in the x509.genkey file, the req_distinguished_name section
118+
should be altered from the default:
119+
120+
[ req_distinguished_name ]
121+
O = Magrathea
122+
CN = Glacier signing key
123+
emailAddress = slartibartfast@magrathea.h2g2
124+
125+
The generated RSA key size can also be set with:
126+
127+
[ req ]
128+
default_bits = 4096
129+
130+
131+
It is also possible to manually generate the key private/public files using the
132+
x509.genkey key generation configuration file in the root node of the Linux
133+
kernel sources tree and the openssl command. The following is an example to
134+
generate the public/private key files:
135+
136+
openssl req -new -nodes -utf8 -sha256 -days 36500 -batch -x509 \
137+
-config x509.genkey -outform DER -out signing_key.x509 \
138+
-keyout signing_key.priv
139+
140+
141+
=========================
142+
PUBLIC KEYS IN THE KERNEL
143+
=========================
144+
145+
The kernel contains a ring of public keys that can be viewed by root. They're
146+
in a keyring called ".system_keyring" that can be seen by:
147+
148+
[root@deneb ~]# cat /proc/keys
149+
...
150+
223c7853 I------ 1 perm 1f030000 0 0 keyring .system_keyring: 1
151+
302d2d52 I------ 1 perm 1f010000 0 0 asymmetri Fedora kernel signing key: d69a84e6bce3d216b979e9505b3e3ef9a7118079: X509.RSA a7118079 []
152+
...
153+
154+
Beyond the public key generated specifically for module signing, any file
155+
placed in the kernel source root directory or the kernel build root directory
156+
whose name is suffixed with ".x509" will be assumed to be an X.509 public key
157+
and will be added to the keyring.
158+
159+
Further, the architecture code may take public keys from a hardware store and
160+
add those in also (e.g. from the UEFI key database).
161+
162+
Finally, it is possible to add additional public keys by doing:
163+
164+
keyctl padd asymmetric "" [.system_keyring-ID] <[key-file]
165+
166+
e.g.:
167+
168+
keyctl padd asymmetric "" 0x223c7853 <my_public_key.x509
169+
170+
Note, however, that the kernel will only permit keys to be added to
171+
.system_keyring _if_ the new key's X.509 wrapper is validly signed by a key
172+
that is already resident in the .system_keyring at the time the key was added.
173+
174+
175+
=========================
176+
MANUALLY SIGNING MODULES
177+
=========================
178+
179+
To manually sign a module, use the scripts/sign-file tool available in
180+
the Linux kernel source tree. The script requires 4 arguments:
181+
182+
1. The hash algorithm (e.g., sha256)
183+
2. The private key filename
184+
3. The public key filename
185+
4. The kernel module to be signed
186+
187+
The following is an example to sign a kernel module:
188+
189+
scripts/sign-file sha512 kernel-signkey.priv \
190+
kernel-signkey.x509 module.ko
191+
192+
The hash algorithm used does not have to match the one configured, but if it
193+
doesn't, you should make sure that hash algorithm is either built into the
194+
kernel or can be loaded without requiring itself.
195+
196+
197+
============================
198+
SIGNED MODULES AND STRIPPING
199+
============================
200+
201+
A signed module has a digital signature simply appended at the end. The string
202+
"~Module signature appended~." at the end of the module's file confirms that a
203+
signature is present but it does not confirm that the signature is valid!
204+
205+
Signed modules are BRITTLE as the signature is outside of the defined ELF
206+
container. Thus they MAY NOT be stripped once the signature is computed and
207+
attached. Note the entire module is the signed payload, including any and all
208+
debug information present at the time of signing.
209+
210+
211+
======================
212+
LOADING SIGNED MODULES
213+
======================
214+
215+
Modules are loaded with insmod, modprobe, init_module() or finit_module(),
216+
exactly as for unsigned modules as no processing is done in userspace. The
217+
signature checking is all done within the kernel.
218+
219+
220+
=========================================
221+
NON-VALID SIGNATURES AND UNSIGNED MODULES
222+
=========================================
223+
224+
If CONFIG_MODULE_SIG_FORCE is enabled or enforcemodulesig=1 is supplied on
225+
the kernel command line, the kernel will only load validly signed modules
226+
for which it has a public key. Otherwise, it will also load modules that are
227+
unsigned. Any module for which the kernel has a key, but which proves to have
228+
a signature mismatch will not be permitted to load.
229+
230+
Any module that has an unparseable signature will be rejected.
231+
232+
233+
=========================================
234+
ADMINISTERING/PROTECTING THE PRIVATE KEY
235+
=========================================
236+
237+
Since the private key is used to sign modules, viruses and malware could use
238+
the private key to sign modules and compromise the operating system. The
239+
private key must be either destroyed or moved to a secure location and not kept
240+
in the root node of the kernel source tree.

‎Documentation/networking/ip-sysctl.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ ip_default_ttl - INTEGER
1616
Default: 64 (as recommended by RFC1700)
1717

1818
ip_no_pmtu_disc - BOOLEAN
19-
Disable Path MTU Discovery.
20-
default FALSE
19+
Disable Path MTU Discovery. If enabled and a
20+
fragmentation-required ICMP is received, the PMTU to this
21+
destination will be set to min_pmtu (see below). You will need
22+
to raise min_pmtu to the smallest interface MTU on your system
23+
manually if you want to avoid locally generated fragments.
24+
Default: FALSE
2125

2226
min_pmtu - INTEGER
2327
default 552 - minimum discovered Path MTU

‎MAINTAINERS

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3763,9 +3763,11 @@ F: include/uapi/linux/gigaset_dev.h
37633763

37643764
GPIO SUBSYSTEM
37653765
M: Linus Walleij <linus.walleij@linaro.org>
3766-
S: Maintained
3766+
M: Alexandre Courbot <gnurou@gmail.com>
37673767
L: linux-gpio@vger.kernel.org
3768-
F: Documentation/gpio.txt
3768+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
3769+
S: Maintained
3770+
F: Documentation/gpio/
37693771
F: drivers/gpio/
37703772
F: include/linux/gpio*
37713773
F: include/asm-generic/gpio.h
@@ -3833,6 +3835,12 @@ T: git git://linuxtv.org/media_tree.git
38333835
S: Maintained
38343836
F: drivers/media/usb/gspca/
38353837

3838+
GUID PARTITION TABLE (GPT)
3839+
M: Davidlohr Bueso <davidlohr@hp.com>
3840+
L: linux-efi@vger.kernel.org
3841+
S: Maintained
3842+
F: block/partitions/efi.*
3843+
38363844
STK1160 USB VIDEO CAPTURE DRIVER
38373845
M: Ezequiel Garcia <elezegarcia@gmail.com>
38383846
L: linux-media@vger.kernel.org
@@ -5913,12 +5921,21 @@ M: Steffen Klassert <steffen.klassert@secunet.com>
59135921
M: Herbert Xu <herbert@gondor.apana.org.au>
59145922
M: "David S. Miller" <davem@davemloft.net>
59155923
L: netdev@vger.kernel.org
5916-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
5924+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git
5925+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
59175926
S: Maintained
59185927
F: net/xfrm/
59195928
F: net/key/
59205929
F: net/ipv4/xfrm*
5930+
F: net/ipv4/esp4.c
5931+
F: net/ipv4/ah4.c
5932+
F: net/ipv4/ipcomp.c
5933+
F: net/ipv4/ip_vti.c
59215934
F: net/ipv6/xfrm*
5935+
F: net/ipv6/esp6.c
5936+
F: net/ipv6/ah6.c
5937+
F: net/ipv6/ipcomp6.c
5938+
F: net/ipv6/ip6_vti.c
59225939
F: include/uapi/linux/xfrm.h
59235940
F: include/net/xfrm.h
59245941

@@ -9573,7 +9590,7 @@ F: drivers/xen/*swiotlb*
95739590

95749591
XFS FILESYSTEM
95759592
P: Silicon Graphics Inc
9576-
M: Dave Chinner <dchinner@fromorbit.com>
9593+
M: Dave Chinner <david@fromorbit.com>
95779594
M: Ben Myers <bpm@sgi.com>
95789595
M: xfs@oss.sgi.com
95799596
L: xfs@oss.sgi.com

‎Makefile

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 13
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc4
4+
EXTRAVERSION = -rc5
55
NAME = One Giant Leap for Frogkind
66

77
# *DOCUMENTATION*
@@ -732,19 +732,15 @@ export mod_strip_cmd
732732
# Select initial ramdisk compression format, default is gzip(1).
733733
# This shall be used by the dracut(8) tool while creating an initramfs image.
734734
#
735-
INITRD_COMPRESS=gzip
736-
ifeq ($(CONFIG_RD_BZIP2), y)
737-
INITRD_COMPRESS=bzip2
738-
else ifeq ($(CONFIG_RD_LZMA), y)
739-
INITRD_COMPRESS=lzma
740-
else ifeq ($(CONFIG_RD_XZ), y)
741-
INITRD_COMPRESS=xz
742-
else ifeq ($(CONFIG_RD_LZO), y)
743-
INITRD_COMPRESS=lzo
744-
else ifeq ($(CONFIG_RD_LZ4), y)
745-
INITRD_COMPRESS=lz4
746-
endif
747-
export INITRD_COMPRESS
735+
INITRD_COMPRESS-y := gzip
736+
INITRD_COMPRESS-$(CONFIG_RD_BZIP2) := bzip2
737+
INITRD_COMPRESS-$(CONFIG_RD_LZMA) := lzma
738+
INITRD_COMPRESS-$(CONFIG_RD_XZ) := xz
739+
INITRD_COMPRESS-$(CONFIG_RD_LZO) := lzo
740+
INITRD_COMPRESS-$(CONFIG_RD_LZ4) := lz4
741+
# do not export INITRD_COMPRESS, since we didn't actually
742+
# choose a sane default compression above.
743+
# export INITRD_COMPRESS := $(INITRD_COMPRESS-y)
748744

749745
ifdef CONFIG_MODULE_SIG_ALL
750746
MODSECKEY = ./signing_key.priv

‎arch/arc/include/uapi/asm/unistd.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88

99
/******** no-legacy-syscalls-ABI *******/
1010

11-
#ifndef _UAPI_ASM_ARC_UNISTD_H
11+
/*
12+
* Non-typical guard macro to enable inclusion twice in ARCH sys.c
13+
* That is how the Generic syscall wrapper generator works
14+
*/
15+
#if !defined(_UAPI_ASM_ARC_UNISTD_H) || defined(__SYSCALL)
1216
#define _UAPI_ASM_ARC_UNISTD_H
1317

1418
#define __ARCH_WANT_SYS_EXECVE
@@ -36,4 +40,6 @@ __SYSCALL(__NR_arc_gettls, sys_arc_gettls)
3640
#define __NR_sysfs (__NR_arch_specific_syscall + 3)
3741
__SYSCALL(__NR_sysfs, sys_sysfs)
3842

43+
#undef __SYSCALL
44+
3945
#endif

‎arch/arm/mach-omap2/board-ldp.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,18 @@ static void __init ldp_display_init(void)
242242

243243
static int ldp_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio)
244244
{
245+
int res;
246+
245247
/* LCD enable GPIO */
246248
ldp_lcd_pdata.enable_gpio = gpio + 7;
247249

248250
/* Backlight enable GPIO */
249251
ldp_lcd_pdata.backlight_gpio = gpio + 15;
250252

253+
res = platform_device_register(&ldp_lcd_device);
254+
if (res)
255+
pr_err("Unable to register LCD: %d\n", res);
256+
251257
return 0;
252258
}
253259

@@ -346,7 +352,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
346352

347353
static struct platform_device *ldp_devices[] __initdata = {
348354
&ldp_gpio_keys_device,
349-
&ldp_lcd_device,
350355
};
351356

352357
#ifdef CONFIG_OMAP_MUX

0 commit comments

Comments
 (0)