Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module update from Rusty Russell: "Nothing all that exciting; a new module-from-fd syscall for those who want to verify the source of the module (ChromeOS) and/or use standard IMA on it or other security hooks." * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: MODSIGN: Fix kbuild output when using default extra_certificates MODSIGN: Avoid using .incbin in C source modules: don't hand 0 to vmalloc. module: Remove a extra null character at the top of module->strtab. ASN.1: Use the ASN1_LONG_TAG and ASN1_INDEFINITE_LENGTH constants ASN.1: Define indefinite length marker constant moduleparam: use __UNIQUE_ID() __UNIQUE_ID() MODSIGN: Add modules_sign make target powerpc: add finit_module syscall. ima: support new kernel module syscall add finit_module syscall to asm-generic ARM: add finit_module syscall to ARM security: introduce kernel_module_from_file hook module: add flags arg to sys_finit_module() module: add syscall to load module from fd
This commit is contained in:
@@ -81,7 +81,7 @@ next_tag:
|
||||
goto next_tag;
|
||||
}
|
||||
|
||||
if (unlikely((tag & 0x1f) == 0x1f)) {
|
||||
if (unlikely((tag & 0x1f) == ASN1_LONG_TAG)) {
|
||||
do {
|
||||
if (unlikely(datalen - dp < 2))
|
||||
goto data_overrun_error;
|
||||
@@ -96,7 +96,7 @@ next_tag:
|
||||
goto next_tag;
|
||||
}
|
||||
|
||||
if (unlikely(len == 0x80)) {
|
||||
if (unlikely(len == ASN1_INDEFINITE_LENGTH)) {
|
||||
/* Indefinite length */
|
||||
if (unlikely((tag & ASN1_CONS_BIT) == ASN1_PRIM << 5))
|
||||
goto indefinite_len_primitive;
|
||||
@@ -222,7 +222,7 @@ next_op:
|
||||
if (unlikely(dp >= datalen - 1))
|
||||
goto data_overrun_error;
|
||||
tag = data[dp++];
|
||||
if (unlikely((tag & 0x1f) == 0x1f))
|
||||
if (unlikely((tag & 0x1f) == ASN1_LONG_TAG))
|
||||
goto long_tag_not_supported;
|
||||
|
||||
if (op & ASN1_OP_MATCH__ANY) {
|
||||
@@ -254,7 +254,7 @@ next_op:
|
||||
|
||||
len = data[dp++];
|
||||
if (len > 0x7f) {
|
||||
if (unlikely(len == 0x80)) {
|
||||
if (unlikely(len == ASN1_INDEFINITE_LENGTH)) {
|
||||
/* Indefinite length */
|
||||
if (unlikely(!(tag & ASN1_CONS_BIT)))
|
||||
goto indefinite_len_primitive;
|
||||
|
Reference in New Issue
Block a user