AppleDouble buffer overrun by extremely long filename

[netatalk.git] / libatalk / adouble / ad_attr.c

diff --git a/libatalk/adouble/ad_attr.c b/libatalk/adouble/ad_attr.c
index a5727d52d40a31a2d48939057e95ceed983b0cfc..123560b5683b3e4af2729ce02631f238c48ffe4a 100644 (file)
--- a/libatalk/adouble/ad_attr.c
+++ b/libatalk/adouble/ad_attr.c
@@ -1,7 +1,3 @@
-/*
- * $Id: ad_attr.c,v 1.10 2009-07-21 13:41:16 didg Exp $
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
@@ -64,7 +60,7 @@ int ad_getattr(const struct adouble *ad, u_int16_t *attr)
 /* ----------------- */
 int ad_setattr(const struct adouble *ad, const u_int16_t attribute)
 {
-    u_int16_t *fflags;
+    uint16_t fflags;
 
     /* we don't save open forks indicator */
     u_int16_t attr = attribute & ~htons(ATTRBIT_DOPEN | ATTRBIT_ROPEN);
@@ -82,22 +78,24 @@ int ad_setattr(const struct adouble *ad, const u_int16_t attribute)
     }
 #if AD_VERSION == AD_VERSION2
     else if (ad->ad_version == AD_VERSION2) {
-        if (ad_getentryoff(ad, ADEID_AFPFILEI)) {
+        if (ad_getentryoff(ad, ADEID_AFPFILEI) && ad_getentryoff(ad, ADEID_FINDERI)) {
             memcpy(ad_entry(ad, ADEID_AFPFILEI) + AFPFILEIOFF_ATTR, &attr, sizeof(attr));
             
             /* Now set opaque flags in FinderInfo too */
-            fflags = (u_int16_t *)ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF;
+            memcpy(&fflags, ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, 2);
             if (attr & htons(ATTRBIT_INVISIBLE))
-                *fflags |= htons(FINDERINFO_INVISIBLE);
+                fflags |= htons(FINDERINFO_INVISIBLE);
             else
-                *fflags &= htons(~FINDERINFO_INVISIBLE);
+                fflags &= htons(~FINDERINFO_INVISIBLE);
 
             /* See above comment in ad_getattr() */
             if (attr & htons(ATTRBIT_MULTIUSER)) {
                 if ( ! (ad->ad_adflags & ADFLAGS_DIR) )
-                    *fflags |= htons(FINDERINFO_ISHARED);
+                    fflags |= htons(FINDERINFO_ISHARED);
             } else
-                    *fflags &= htons(~FINDERINFO_ISHARED);
+                    fflags &= htons(~FINDERINFO_ISHARED);
+
+            memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &fflags, 2);
         }
     }
 #endif
@@ -114,24 +112,22 @@ int ad_setattr(const struct adouble *ad, const u_int16_t attribute)
 #if AD_VERSION == AD_VERSION2
 int ad_setid (struct adouble *adp, const dev_t dev, const ino_t ino , const u_int32_t id, const cnid_t did, const void *stamp)
 {
-    if (adp->ad_flags == AD_VERSION2  && ( adp->ad_options & ADVOL_CACHE) &&
-        ad_getentryoff(adp, ADEID_PRIVDEV) &&
-        sizeof(dev_t) == ADEDLEN_PRIVDEV && sizeof(ino_t) == ADEDLEN_PRIVINO)
-    {
+    if ((adp->ad_flags == AD_VERSION2) && (adp->ad_options & ADVOL_CACHE)) {
+
+        /* ad_getid depends on this to detect presence of ALL entries */
+        ad_setentrylen( adp, ADEID_PRIVID, sizeof(id));
+        memcpy(ad_entry( adp, ADEID_PRIVID ), &id, sizeof(id));
+
         ad_setentrylen( adp, ADEID_PRIVDEV, sizeof(dev_t));
         if ((adp->ad_options & ADVOL_NODEV)) {
             memset(ad_entry( adp, ADEID_PRIVDEV ), 0, sizeof(dev_t));
-        }
-        else {
+        } else {
             memcpy(ad_entry( adp, ADEID_PRIVDEV ), &dev, sizeof(dev_t));
         }
 
         ad_setentrylen( adp, ADEID_PRIVINO, sizeof(ino_t));
         memcpy(ad_entry( adp, ADEID_PRIVINO ), &ino, sizeof(ino_t));
 
-        ad_setentrylen( adp, ADEID_PRIVID, sizeof(id));
-        memcpy(ad_entry( adp, ADEID_PRIVID ), &id, sizeof(id));
-
         ad_setentrylen( adp, ADEID_DID, sizeof(did));
         memcpy(ad_entry( adp, ADEID_DID ), &did, sizeof(did));
 
@@ -155,21 +151,20 @@ u_int32_t ad_getid (struct adouble *adp, const dev_t st_dev, const ino_t st_ino
      * note inode and device are opaques and not in network order
      * only use the ID if adouble is writable for us.
      */
-    if (adp && ( adp->ad_options & ADVOL_CACHE) && ( adp->ad_md->adf_flags & O_RDWR )
-        && sizeof(dev_t) == ad_getentrylen(adp, ADEID_PRIVDEV)
-        && sizeof(ino_t) == ad_getentrylen(adp,ADEID_PRIVINO)
-        && sizeof(temp) == ad_getentrylen(adp,ADEID_PRIVSYN)
-        && sizeof(cnid_t) == ad_getentrylen(adp, ADEID_DID)
-        && sizeof(cnid_t) == ad_getentrylen(adp, ADEID_PRIVID)
+    if (adp
+        && (adp->ad_options & ADVOL_CACHE)
+        && (adp->ad_md->adf_flags & O_RDWR )
+        && (sizeof(dev_t) == ad_getentrylen(adp, ADEID_PRIVDEV)) /* One check to ensure ALL values are there */
         ) {
         memcpy(&dev, ad_entry(adp, ADEID_PRIVDEV), sizeof(dev_t));
         memcpy(&ino, ad_entry(adp, ADEID_PRIVINO), sizeof(ino_t));
         memcpy(temp, ad_entry(adp, ADEID_PRIVSYN), sizeof(temp));
         memcpy(&a_did, ad_entry(adp, ADEID_DID), sizeof(cnid_t));
 
-        if (  ((adp->ad_options & ADVOL_NODEV) || dev == st_dev)
-              && ino == st_ino && a_did == did
-              && !memcmp(stamp, temp, sizeof(temp))) {
+        if ( ((adp->ad_options & ADVOL_NODEV) || dev == st_dev)
+             && ino == st_ino
+             && (!did || a_did == did)
+             && (memcmp(stamp, temp, sizeof(temp)) == 0) ) {
             memcpy(&aint, ad_entry(adp, ADEID_PRIVID), sizeof(aint));
             return aint;
         }
@@ -182,12 +177,7 @@ u_int32_t ad_forcegetid (struct adouble *adp)
 {
     u_int32_t aint = 0;
 
-    if (adp && ( adp->ad_options & ADVOL_CACHE)
-        && sizeof(dev_t) == ad_getentrylen(adp, ADEID_PRIVDEV)
-        && sizeof(ino_t) == ad_getentrylen(adp,ADEID_PRIVINO)
-        && sizeof(cnid_t) == ad_getentrylen(adp, ADEID_DID)
-        && sizeof(cnid_t) == ad_getentrylen(adp, ADEID_PRIVID)
-        ) {
+    if (adp && (adp->ad_options & ADVOL_CACHE)) {
         memcpy(&aint, ad_entry(adp, ADEID_PRIVID), sizeof(aint));
         return aint;
     }
@@ -200,9 +190,12 @@ u_int32_t ad_forcegetid (struct adouble *adp)
  */
 int ad_setname(struct adouble *ad, const char *path)
 {
-    if (ad_getentryoff(ad, ADEID_NAME)) {
-        ad_setentrylen( ad, ADEID_NAME, strlen( path ));
-        memcpy(ad_entry( ad, ADEID_NAME ), path, ad_getentrylen( ad, ADEID_NAME ));
+    int len;
+    if ((len = strlen(path)) > ADEDLEN_NAME)
+        len = ADEDLEN_NAME;
+    if (path && ad_getentryoff(ad, ADEID_NAME)) {
+        ad_setentrylen( ad, ADEID_NAME, len);
+        memcpy(ad_entry( ad, ADEID_NAME ), path, len);
         return 1;
     }
     return 0;