summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-09-01 00:09:37 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-02 08:48:10 +0100
commit0b1f2cff16d13de92a04e14db96201a2f78d9e41 (patch)
treecd2f76328e34a443672055b910cdb2b128be967e
parent448ad389cbc12f72d9cc6ab087a694bb01a99cdf (diff)
downloadlinux-stable-0b1f2cff16d13de92a04e14db96201a2f78d9e41.tar.gz
linux-stable-0b1f2cff16d13de92a04e14db96201a2f78d9e41.tar.bz2
linux-stable-0b1f2cff16d13de92a04e14db96201a2f78d9e41.zip
xtensa: uaccess: Add missing __user to strncpy_from_user() prototype
[ Upstream commit dc293f2106903ab9c24e9cea18c276e32c394c33 ] When adding __user annotations in commit 2adf5352a34a, the strncpy_from_user() function declaration for the CONFIG_GENERIC_STRNCPY_FROM_USER case was missed. Fix it. Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Message-Id: <20200831210937.17938-1-laurent.pinchart@ideasonboard.com> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--arch/xtensa/include/asm/uaccess.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/uaccess.h b/arch/xtensa/include/asm/uaccess.h
index f1158b4c629c..da4effe27007 100644
--- a/arch/xtensa/include/asm/uaccess.h
+++ b/arch/xtensa/include/asm/uaccess.h
@@ -291,7 +291,7 @@ strncpy_from_user(char *dst, const char *src, long count)
return -EFAULT;
}
#else
-long strncpy_from_user(char *dst, const char *src, long count);
+long strncpy_from_user(char *dst, const char __user *src, long count);
#endif
/*