ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'selinux-pr-20200416' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux

Browse Source 
Pull SELinux fix from Paul Moore:
 "One small SELinux fix to ensure we cleanup properly on an error
  condition"

* tag 'selinux-pr-20200416' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: free str on error in str_read()
This commit is contained in:
Linus Torvalds
2020-04-16 10:45:47 -07:00
parent 3fa84bf926 af15f14c8c
commit 9786cab674
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
security/selinux/ss/policydb.c
View File

@@ -1035,14 +1035,14 @@ static int str_read(char **strp, gfp_t flags, void *fp, u32 len)
if (!str) if (!str)
return -ENOMEM; return -ENOMEM;
/* it's expected the caller should free the str */
*strp = str;
rc = next_entry(str, fp, len); rc = next_entry(str, fp, len);
if (rc) if (rc) {
kfree(str);
return rc; return rc;
}
str[len] = '\0'; str[len] = '\0';
*strp = str;
return 0; return 0;
} }