nathan/Chromebook-Device-Nyan-NVIDIA-Tegra-K1-T124-Upstream-Linux-3.10-LTS-Kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed building with backported AppArmor

Browse Source
This commit is contained in:
Nathan 2025-04-08 20:27:49 -05:00
parent 3337d21439
commit 74577147bc
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/mm.h
View File

@ -327,6 +327,8 @@ static inline int is_vmalloc_or_module_addr(const void *x)
} }
#endif #endif
extern void kvfree(const void *addr);
static inline void compound_lock(struct page *page) static inline void compound_lock(struct page *page)
{ {
#ifdef CONFIG_TRANSPARENT_HUGEPAGE #ifdef CONFIG_TRANSPARENT_HUGEPAGE

9
mm/util.c
View File

@ -479,6 +479,15 @@ unsigned long vm_mmap(struct file *file, unsigned long addr,
} }
EXPORT_SYMBOL(vm_mmap); EXPORT_SYMBOL(vm_mmap);
void kvfree(const void *addr)
{
if (is_vmalloc_addr(addr))
vfree(addr);
else
kfree(addr);
}
EXPORT_SYMBOL(kvfree);
struct address_space *page_mapping(struct page *page) struct address_space *page_mapping(struct page *page)
{ {
struct address_space *mapping = page->mapping; struct address_space *mapping = page->mapping;

2
security/apparmor/path.c
View File

@ -158,7 +158,7 @@ static int d_namespace_path(struct path *path, char *buf, char **name,
* security_path hooks as a deleted dentry except without an inode * security_path hooks as a deleted dentry except without an inode
* allocated. * allocated.
*/ */
if (d_unlinked(path->dentry) && d_is_positive(path->dentry) && if (d_unlinked(path->dentry) && path->dentry->d_inode &&
!(flags & PATH_MEDIATE_DELETED)) { !(flags & PATH_MEDIATE_DELETED)) {
error = -ENOENT; error = -ENOENT;
goto out; goto out;