From f6aa46fff8981e3228a8603570d9f699c5da4927 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 1 Oct 2019 09:41:17 +0200 Subject: [PATCH] ANDROID: properly export new symbols with _GPL tag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For new symbols that are exported based on non-upstream patches, the exports must be _GPL in order to make sure nothing funny is happening here. This fixes up 50f0dd432bf5 ("ANDROID: sdcardfs: Enable modular sdcardfs") to properly export things correctly. Cc: Daniel Rosenberg Cc: Guenter Roeck Cc: Alistair Strachan Reported-by: Karim Yaghmour Reported-by: François-Denis Gonthier Signed-off-by: Greg Kroah-Hartman Change-Id: I0d663c08d34be74b19c84cdc1d3c7a2b90a029e6 --- fs/fs_struct.c | 4 ++-- fs/read_write.c | 4 ++-- security/security.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/fs_struct.c b/fs/fs_struct.c index 987c95b950f6..97c2c52e9398 100644 --- a/fs/fs_struct.c +++ b/fs/fs_struct.c @@ -45,7 +45,7 @@ void set_fs_pwd(struct fs_struct *fs, const struct path *path) if (old_pwd.dentry) path_put(&old_pwd); } -EXPORT_SYMBOL(set_fs_pwd); +EXPORT_SYMBOL_GPL(set_fs_pwd); static inline int replace_path(struct path *p, const struct path *old, const struct path *new) { @@ -91,7 +91,7 @@ void free_fs_struct(struct fs_struct *fs) path_put(&fs->pwd); kmem_cache_free(fs_cachep, fs); } -EXPORT_SYMBOL(free_fs_struct); +EXPORT_SYMBOL_GPL(free_fs_struct); void exit_fs(struct task_struct *tsk) { diff --git a/fs/read_write.c b/fs/read_write.c index 620b491162d4..2f86e558dad4 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -460,7 +460,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) return ret; } -EXPORT_SYMBOL(vfs_read); +EXPORT_SYMBOL_GPL(vfs_read); static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos) { @@ -560,7 +560,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ return ret; } -EXPORT_SYMBOL(vfs_write); +EXPORT_SYMBOL_GPL(vfs_write); static inline loff_t file_pos_read(struct file *file) { diff --git a/security/security.c b/security/security.c index f71c586ae55b..74dcf97783bb 100644 --- a/security/security.c +++ b/security/security.c @@ -607,7 +607,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) return 0; return call_int_hook(path_chown, 0, path, uid, gid); } -EXPORT_SYMBOL(security_path_chown); +EXPORT_SYMBOL_GPL(security_path_chown); int security_path_chroot(const struct path *path) {