usrloc ct IDs: Never pack more than 14 bits from a contact label

liviuchircu · liviuchircu · commit 872c4e89d23a · 2021-02-10T13:57:31.000+02:00
diff --git a/modules/usrloc/dlist.h b/modules/usrloc/dlist.h
@@ -123,7 +123,8 @@ static inline void init_urecord_labels(urecord_t *r, udomain_t *d)
 static inline uint64_t
 pack_indexes(unsigned short aorhash, unsigned int rlabel, unsigned short clabel)
 {
-	return clabel + ((uint64_t)rlabel << 14) + ((uint64_t)aorhash << 46);
+	return (clabel & CLABEL_MASK) +
+		((uint64_t)rlabel << 14) + ((uint64_t)aorhash << 46);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,8 @@ static inline void init_urecord_labels(urecord_t r, udomain_t d)`
`123`	`123`	`static inline uint64_t`
`124`	`124`	`pack_indexes(unsigned short aorhash, unsigned int rlabel, unsigned short clabel)`
`125`	`125`	`{`
`126`		`- return clabel + ((uint64_t)rlabel << 14) + ((uint64_t)aorhash << 46);`
	`126`	`+ return (clabel & CLABEL_MASK) +`
	`127`	`+ ((uint64_t)rlabel << 14) + ((uint64_t)aorhash << 46);`
`127`	`128`	`}`
`128`	`129`
`129`	`130`