linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andreas Gruenbacher <agruenba@redhat.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Andreas Gruenbacher <agruenba@redhat.com>, linux-fsdevel@vger.kernel.org
Subject: [PATCH 4/5] sockfs: getxattr: Fail with -EOPNOTSUPP for invalid attribute names
Date: Fri, 29 Apr 2016 16:18:36 +0200	[thread overview]
Message-ID: <1461939517-15497-5-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1461939517-15497-1-git-send-email-agruenba@redhat.com>

The standard return value for unsupported attribute names is
-EOPNOTSUPP, as opposed to undefined but supported attributes
(-ENODATA).  Also, fail for attribute names like
"system.sockprotonameXXX" and simplify the code a bit.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
 net/socket.c | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/net/socket.c b/net/socket.c
index 35e4523..23fdd83 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -469,27 +469,15 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
 static ssize_t sockfs_getxattr(struct dentry *dentry, struct inode *inode,
 			       const char *name, void *value, size_t size)
 {
-	const char *proto_name;
-	size_t proto_size;
-	int error;
-
-	error = -ENODATA;
-	if (!strncmp(name, XATTR_NAME_SOCKPROTONAME, XATTR_NAME_SOCKPROTONAME_LEN)) {
-		proto_name = dentry->d_name.name;
-		proto_size = strlen(proto_name);
-
+	if (!strcmp(name, XATTR_NAME_SOCKPROTONAME)) {
 		if (value) {
-			error = -ERANGE;
-			if (proto_size + 1 > size)
-				goto out;
-
-			strncpy(value, proto_name, proto_size + 1);
+			if (dentry->d_name.len + 1 > size)
+				return -ERANGE;
+			memcpy(value, dentry->d_name.name, dentry->d_name.len + 1);
 		}
-		error = proto_size + 1;
+		return dentry->d_name.len + 1;
 	}
-
-out:
-	return error;
+	return -EOPNOTSUPP;
 }
 
 static ssize_t sockfs_listxattr(struct dentry *dentry, char *buffer,
-- 
2.5.5


  parent reply	other threads:[~2016-04-29 14:18 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-29 14:18 [PATCH 0/5] Some more xattr cleanups Andreas Gruenbacher
2016-04-29 14:18 ` [PATCH 1/5] jffs2: Remove jffs2_{get,set,remove}xattr macros Andreas Gruenbacher
2016-04-29 14:18 ` [PATCH 2/5] hfs: Switch to generic xattr handlers Andreas Gruenbacher
2016-04-29 14:18 ` [PATCH 3/5] kernfs: " Andreas Gruenbacher
2016-04-30 17:02   ` Greg Kroah-Hartman
2016-04-30 17:25     ` Al Viro
2016-05-01 10:45     ` Andreas Grünbacher
2016-05-01 16:27       ` Greg Kroah-Hartman
2016-04-29 14:18 ` Andreas Gruenbacher [this message]
2016-04-29 14:18 ` [PATCH 5/5] sockfs: Get rid of getxattr iop Andreas Gruenbacher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1461939517-15497-5-git-send-email-agruenba@redhat.com \
    --to=agruenba@redhat.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).