diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2021-03-17 21:27:13 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2021-03-17 21:27:13 +0200 |
| commit | 183f2051d299eb7b35d8e37d01be9077dd809839 (patch) | |
| tree | 4937226d67edb7c827ce7a360d1f83ff07dd36e9 /security | |
| parent | c66c1e4925165243b33081fd609c4a8a7d35e2fc (diff) | |
| parent | 58bc8e0469d0808754b42e423934da639c07b6ba (diff) | |
Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/common into lineage-18.1-caf-msm8998
This brings LA.UM.9.2.r1-02700-SDMxx0.0 up to date with
https://android.googlesource.com/kernel/common/ android-4.4-p at commit:
58bc8e0469d08 Merge 4.4.261 into android-4.4-p
Conflicts:
drivers/block/zram/zram_drv.c
drivers/block/zram/zram_drv.h
mm/zsmalloc.c
Change-Id: I451bffa685eaaea04938bc6d0b8e3f4bb0f869e9
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/trusted.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/trusted.c b/security/keys/trusted.c index 214ae2dc7f64..4b350fec3153 100644 --- a/security/keys/trusted.c +++ b/security/keys/trusted.c @@ -778,7 +778,7 @@ static int getoptions(char *c, struct trusted_key_payload *pay, case Opt_migratable: if (*args[0].from == '0') pay->migratable = 0; - else + else if (*args[0].from != '1') return -EINVAL; break; case Opt_pcrlock: |