All of lore.kernel.org
 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,
	Tyler Hicks <tyhicks@canonical.com>,
	ecryptfs@vger.kernel.org, Miklos Szeredi <miklos@szeredi.hu>,
	linux-unionfs@vger.kernel.org,
	Mimi Zohar <zohar@linux.vnet.ibm.com>,
	linux-ima-devel@lists.sourceforge.net,
	linux-security-module@vger.kernel.org,
	David Howells <dhowells@redhat.com>,
	Serge Hallyn <serge.hallyn@canonical.com>,
	Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
	Paul Moore <paul@paul-moore.com>,
	Stephen Smalley <sds@tycho.nsa.gov>,
	Eric Paris <eparis@parisplace.org>,
	Casey Schaufler <casey@schaufler-ca.com>,
	Oleg Drokin <oleg.drokin@intel.com>,
	Andreas Dilger <andreas.dilger@intel.com>
Subject: [PATCH v3 05/17] sockfs: getxattr: Fail with -EOPNOTSUPP for invalid attribute names
Date: Mon, 30 May 2016 10:57:21 +0200	[thread overview]
Message-ID: <1464598653-3656-6-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1464598653-3656-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 a1bd161..9b3dca6 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-05-30  8:58 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-30  8:57 [PATCH v3 00/17] Xattr inode operation removal Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 01/17] xattr: Remove unnecessary NULL attribute name check Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 02/17] jffs2: Remove jffs2_{get,set,remove}xattr macros Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 03/17] hfs: Switch to generic xattr handlers Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 04/17] kernfs: " Andreas Gruenbacher
2016-05-30  8:57 ` Andreas Gruenbacher [this message]
2016-05-30  8:57 ` [PATCH v3 06/17] sockfs: Get rid of getxattr iop Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 07/17] ecryptfs: Switch to generic xattr handlers Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 08/17] overlayfs: " Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 09/17] fuse: " Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 10/17] vfs: Move xattr_resolve_name to the front of fs/xattr.c Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 11/17] vfs: Add IOP_XATTR inode operations flag Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 12/17] vfs: Use IOP_XATTR flag for bad-inode handling Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 13/17] libfs: Use IOP_XATTR flag for empty directory handling Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 14/17] xattr: Add __vfs_{get,set,remove}xattr helpers Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 15/17] vfs: Check for the IOP_XATTR flag in listxattr Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 16/17] xattr: Stop calling {get,set,remove}xattr inode operations Andreas Gruenbacher
2016-05-30  8:57 ` [PATCH v3 17/17] vfs: Remove " Andreas Gruenbacher
2016-05-30  9:54 ` [PATCH v3 00/17] Xattr inode operation removal Sedat Dilek
2016-05-30 10:49   ` Andreas Gruenbacher
2016-05-30 12:56     ` Sedat Dilek
2016-05-30 16:02       ` Sedat Dilek
2016-05-30 18:22         ` Andreas Gruenbacher
2016-05-30 18:51           ` Sedat Dilek
2016-05-30 19:19             ` Sedat Dilek
2016-05-30 19:29             ` Andreas Gruenbacher
2016-05-30 19:55               ` Sedat Dilek

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=1464598653-3656-6-git-send-email-agruenba@redhat.com \
    --to=agruenba@redhat.com \
    --cc=andreas.dilger@intel.com \
    --cc=casey@schaufler-ca.com \
    --cc=dhowells@redhat.com \
    --cc=dmitry.kasatkin@gmail.com \
    --cc=ecryptfs@vger.kernel.org \
    --cc=eparis@parisplace.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-ima-devel@lists.sourceforge.net \
    --cc=linux-security-module@vger.kernel.org \
    --cc=linux-unionfs@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    --cc=oleg.drokin@intel.com \
    --cc=paul@paul-moore.com \
    --cc=sds@tycho.nsa.gov \
    --cc=serge.hallyn@canonical.com \
    --cc=tyhicks@canonical.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=zohar@linux.vnet.ibm.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.