mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Linux 5.4-rc3
-----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl2jtUYeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGL28H/Akb3JEXNKHCv3MI 89dzKlLgf/W/e0qJirb9/YdcUL462NUFoC0Bg0qLgLFYdhT94Zp5J68C4oZPJfxA /LrTDsHWrbUtTvhxJqMueVT3JTpkF36ZTvTGwLTHzTqexM/o3kuDWjWTTxZlMGbX Uais/ywmmCVCmaX8IJ3GJFGCJse+T1W73VOSo7bm6C+Ruy6Euwasa9kc40uHiPpD 6Xew9j9AJ0xIV96sLzDFOYAXYFQBZnAbFLA+Ho53TiuG78J6MP4Pm9+1VhMyF1uH mgeA5GAfKpqq/QXf32iMU7s7HTdoF5r1UaQJtu+p6BFTGhd7LrDrh4gA/9Wyv7+t 9stS20U= =ima3 -----END PGP SIGNATURE----- Merge 5.4-rc3 into android-mainline Linux 5.4-rc3 Signed-off-by: Greg Kroah-Hartman <[email protected]> Change-Id: Ia87ba662738dd58ddb917e32c1fbd812861e7a46
This commit is contained in:
commit
630839ac24
396 changed files with 3472 additions and 4619 deletions
|
|
@ -1946,7 +1946,14 @@ static int convert_context(struct context *oldc, struct context *newc, void *p)
|
|||
rc = string_to_context_struct(args->newp, NULL, s,
|
||||
newc, SECSID_NULL);
|
||||
if (rc == -EINVAL) {
|
||||
/* Retain string representation for later mapping. */
|
||||
/*
|
||||
* Retain string representation for later mapping.
|
||||
*
|
||||
* IMPORTANT: We need to copy the contents of oldc->str
|
||||
* back into s again because string_to_context_struct()
|
||||
* may have garbled it.
|
||||
*/
|
||||
memcpy(s, oldc->str, oldc->len);
|
||||
context_init(newc);
|
||||
newc->str = s;
|
||||
newc->len = oldc->len;
|
||||
|
|
|
|||
Loading…
Reference in a new issue