diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c
index 650ff299738bc22bd7e8be8e7c3527ff4dcef47d..5a60c508af4ed7e8492a69e8c18276c9981fb62d 100644
--- a/fs/orangefs/namei.c
+++ b/fs/orangefs/namei.c
@@ -269,6 +269,9 @@ static int orangefs_symlink(struct inode *dir,
 	if (!symname)
 		return -EINVAL;
 
+	if (strlen(symname)+1 > ORANGEFS_NAME_MAX)
+		return -ENAMETOOLONG;
+
 	new_op = op_alloc(ORANGEFS_VFS_OP_SYMLINK);
 	if (!new_op)
 		return -ENOMEM;