cifs: fix hardcoded default security descriptor length

It was hardcoded to 192 bytes, which was not enough when the max number
of subauthorities went to 15. Redefine this constant in terms of sizeof
the structs involved, and rename it for better clarity.

While we're at it, remove a couple more unused constants from cifsacl.h.

Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 38afad8afc4e94f42eb52007e0f5cd990860e2e8..d811af364174313d4b491ef7a01336e853497561 100644 (file)
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -1008,7 +1008,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 nmode,
         * memory for the smb header, set security descriptor request security
         * descriptor parameters, and secuirty descriptor itself
         */
-       secdesclen = max_t(u32, secdesclen, DEFSECDESCLEN);
+       secdesclen = max_t(u32, secdesclen, DEFAULT_SEC_DESC_LEN);
        pnntsd = kmalloc(secdesclen, GFP_KERNEL);
        if (!pnntsd) {
                cERROR(1, "Unable to allocate security descriptor");

diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h
index 46cd444ea2f26038d64ad23fa7e3615b2f4eadcf..a445405f80d0fb0bc0a4c90543e02c6d4e981ffe 100644 (file)
--- a/fs/cifs/cifsacl.h
+++ b/fs/cifs/cifsacl.h
@@ -25,9 +25,6 @@
 
 #define NUM_AUTHS (6)  /* number of authority fields */
 #define SID_MAX_SUB_AUTHORITIES (15) /* max number of sub authority fields */
-#define NUM_WK_SIDS 7 /* number of well known sids */
-#define SIDNAMELENGTH 20 /* long enough for the ones we care about */
-#define DEFSECDESCLEN 192 /* sec desc len contaiting a dacl with three aces */
 
 #define READ_BIT        0x4
 #define WRITE_BIT       0x2
@@ -42,6 +39,14 @@
 #define SIDOWNER 1
 #define SIDGROUP 2
 
+/*
+ * Security Descriptor length containing DACL with 3 ACEs (one each for
+ * owner, group and world).
+ */
+#define DEFAULT_SEC_DESC_LEN (sizeof(struct cifs_ntsd) + \
+                             sizeof(struct cifs_acl) + \
+                             (sizeof(struct cifs_ace) * 3))
+
 /*
  * Maximum size of a string representation of a SID:
  *