mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security
* 'next' of git://selinuxproject.org/~jmorris/linux-security: (95 commits) TOMOYO: Fix incomplete read after seek. Smack: allow to access /smack/access as normal user TOMOYO: Fix unused kernel config option. Smack: fix: invalid length set for the result of /smack/access Smack: compilation fix Smack: fix for /smack/access output, use string instead of byte Smack: domain transition protections (v3) Smack: Provide information for UDS getsockopt(SO_PEERCRED) Smack: Clean up comments Smack: Repair processing of fcntl Smack: Rule list lookup performance Smack: check permissions from user space (v2) TOMOYO: Fix quota and garbage collector. TOMOYO: Remove redundant tasklist_lock. TOMOYO: Fix domain transition failure warning. TOMOYO: Remove tomoyo_policy_memory_lock spinlock. TOMOYO: Simplify garbage collector. TOMOYO: Fix make namespacecheck warnings. target: check hex2bin result encrypted-keys: check hex2bin result ...
This commit is contained in:
commit
36b8d186e6
99 changed files with 4701 additions and 1432 deletions
|
|
@ -63,6 +63,7 @@ u32 sas_get_pr_transport_id(
|
|||
unsigned char *buf)
|
||||
{
|
||||
unsigned char *ptr;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* Set PROTOCOL IDENTIFIER to 6h for SAS
|
||||
|
|
@ -74,7 +75,9 @@ u32 sas_get_pr_transport_id(
|
|||
*/
|
||||
ptr = &se_nacl->initiatorname[4]; /* Skip over 'naa. prefix */
|
||||
|
||||
hex2bin(&buf[4], ptr, 8);
|
||||
ret = hex2bin(&buf[4], ptr, 8);
|
||||
if (ret < 0)
|
||||
pr_debug("sas transport_id: invalid hex string\n");
|
||||
|
||||
/*
|
||||
* The SAS Transport ID is a hardcoded 24-byte length
|
||||
|
|
@ -156,8 +159,9 @@ u32 fc_get_pr_transport_id(
|
|||
unsigned char *buf)
|
||||
{
|
||||
unsigned char *ptr;
|
||||
int i;
|
||||
int i, ret;
|
||||
u32 off = 8;
|
||||
|
||||
/*
|
||||
* PROTOCOL IDENTIFIER is 0h for FCP-2
|
||||
*
|
||||
|
|
@ -174,7 +178,9 @@ u32 fc_get_pr_transport_id(
|
|||
i++;
|
||||
continue;
|
||||
}
|
||||
hex2bin(&buf[off++], &ptr[i], 1);
|
||||
ret = hex2bin(&buf[off++], &ptr[i], 1);
|
||||
if (ret < 0)
|
||||
pr_debug("fc transport_id: invalid hex string\n");
|
||||
i += 2;
|
||||
}
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue