Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus

James Morris
2 parents 609cfda586 bf69d41d19
Showing 5 changed files Side-by-side Diff
Documentation/flexible-arrays.txt
include/linux/flex_array.h
lib/flex_array.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
@@ -66,10 +66,10 @@
 entering atomic context, using:
  
     int flex_array_prealloc(struct flex_array *array, unsigned int start,
-			    unsigned int end, gfp_t flags);
+			    unsigned int nr_elements, gfp_t flags);
  
 This function will ensure that memory for the elements indexed in the range
-defined by start and end has been allocated.  Thereafter, a
+defined by start and nr_elements has been allocated.  Thereafter, a
 flex_array_put() call on an element in that range is guaranteed not to
 block.
  
@@ -61,7 +61,7 @@
 struct flex_array *flex_array_alloc(int element_size, unsigned int total,
 		gfp_t flags);
 int flex_array_prealloc(struct flex_array *fa, unsigned int start,
-		unsigned int end, gfp_t flags);
+		unsigned int nr_elements, gfp_t flags);
 void flex_array_free(struct flex_array *fa);
 void flex_array_free_parts(struct flex_array *fa);
 int flex_array_put(struct flex_array *fa, unsigned int element_nr, void *src,
@@ -232,10 +232,10 @@
  
 /**
  * flex_array_prealloc - guarantee that array space exists
- * @fa:		the flex array for which to preallocate parts
- * @start:	index of first array element for which space is allocated
- * @end:	index of last (inclusive) element for which space is allocated
- * @flags:	page allocation flags
+ * @fa:			the flex array for which to preallocate parts
+ * @start:		index of first array element for which space is allocated
+ * @nr_elements:	number of elements for which space is allocated
+ * @flags:		page allocation flags
  *
  * This will guarantee that no future calls to flex_array_put()
  * will allocate memory.  It can be used if you are expecting to
  
  
  
@@ -245,15 +245,25 @@
  * Locking must be provided by the caller.
  */
 int flex_array_prealloc(struct flex_array *fa, unsigned int start,
-			unsigned int end, gfp_t flags)
+			unsigned int nr_elements, gfp_t flags)
 {
 	int start_part;
 	int end_part;
 	int part_nr;
+	unsigned int end;
 	struct flex_array_part *part;
  
-	if (start >= fa->total_nr_elements || end >= fa->total_nr_elements)
+	if (!start && !nr_elements)
+		return 0;
+	if (start >= fa->total_nr_elements)
 		return -ENOSPC;
+	if (!nr_elements)
+		return 0;
+
+	end = start + nr_elements - 1;
+
+	if (end >= fa->total_nr_elements)
+		return -ENOSPC;
 	if (elements_fit_in_base(fa))
 		return 0;
 	start_part = fa_element_to_part_nr(fa, start);
@@ -343,6 +353,8 @@
 	int part_nr;
 	int ret = 0;
  
+	if (!fa->total_nr_elements)
+		return 0;
 	if (elements_fit_in_base(fa))
 		return ret;
 	for (part_nr = 0; part_nr < FLEX_ARRAY_NR_BASE_PTRS; part_nr++) {
@@ -1578,7 +1578,8 @@
 		return rc;
  
 	if (!newsid || !(sbsec->flags & SE_SBLABELSUPP)) {
-		rc = security_transition_sid(sid, dsec->sid, tclass, NULL, &newsid);
+		rc = security_transition_sid(sid, dsec->sid, tclass,
+					     &dentry->d_name, &newsid);
 		if (rc)
 			return rc;
 	}
@@ -502,7 +502,7 @@
 		goto out;
  
 	rc = flex_array_prealloc(p->type_val_to_struct_array, 0,
-				 p->p_types.nprim - 1, GFP_KERNEL | __GFP_ZERO);
+				 p->p_types.nprim, GFP_KERNEL | __GFP_ZERO);
 	if (rc)
 		goto out;
  
@@ -519,7 +519,7 @@
 			goto out;
  
 		rc = flex_array_prealloc(p->sym_val_to_name[i],
-					 0, p->symtab[i].nprim - 1,
+					 0, p->symtab[i].nprim,
 					 GFP_KERNEL | __GFP_ZERO);
 		if (rc)
 			goto out;
@@ -2375,7 +2375,7 @@
 		goto bad;
  
 	/* preallocate so we don't have to worry about the put ever failing */
-	rc = flex_array_prealloc(p->type_attr_map_array, 0, p->p_types.nprim - 1,
+	rc = flex_array_prealloc(p->type_attr_map_array, 0, p->p_types.nprim,
 				 GFP_KERNEL | __GFP_ZERO);
 	if (rc)
 		goto bad;
...	...	@@ -66,10 +66,10 @@
66	66	entering atomic context, using:
67	67
68	68	int flex_array_prealloc(struct flex_array *array, unsigned int start,
69		- unsigned int end, gfp_t flags);
	69	+ unsigned int nr_elements, gfp_t flags);
70	70
71	71	This function will ensure that memory for the elements indexed in the range
72		-defined by start and end has been allocated. Thereafter, a
	72	+defined by start and nr_elements has been allocated. Thereafter, a
73	73	flex_array_put() call on an element in that range is guaranteed not to
74	74	block.
75	75
...	...	@@ -61,7 +61,7 @@
61	61	struct flex_array *flex_array_alloc(int element_size, unsigned int total,
62	62	gfp_t flags);
63	63	int flex_array_prealloc(struct flex_array *fa, unsigned int start,
64		- unsigned int end, gfp_t flags);
	64	+ unsigned int nr_elements, gfp_t flags);
65	65	void flex_array_free(struct flex_array *fa);
66	66	void flex_array_free_parts(struct flex_array *fa);
67	67	int flex_array_put(struct flex_array fa, unsigned int element_nr, void src,
...	...	@@ -232,10 +232,10 @@
232	232
233	233	/**
234	234	* flex_array_prealloc - guarantee that array space exists
235		- * @fa: the flex array for which to preallocate parts
236		- * @start: index of first array element for which space is allocated
237		- * @end: index of last (inclusive) element for which space is allocated
238		- * @flags: page allocation flags
	235	+ * @fa: the flex array for which to preallocate parts
	236	+ * @start: index of first array element for which space is allocated
	237	+ * @nr_elements: number of elements for which space is allocated
	238	+ * @flags: page allocation flags
239	239	*
240	240	* This will guarantee that no future calls to flex_array_put()
241	241	* will allocate memory. It can be used if you are expecting to
242	242
243	243
244	244
...	...	@@ -245,15 +245,25 @@
245	245	* Locking must be provided by the caller.
246	246	*/
247	247	int flex_array_prealloc(struct flex_array *fa, unsigned int start,
248		- unsigned int end, gfp_t flags)
	248	+ unsigned int nr_elements, gfp_t flags)
249	249	{
250	250	int start_part;
251	251	int end_part;
252	252	int part_nr;
	253	+ unsigned int end;
253	254	struct flex_array_part *part;
254	255
255		- if (start >= fa->total_nr_elements \|\| end >= fa->total_nr_elements)
	256	+ if (!start && !nr_elements)
	257	+ return 0;
	258	+ if (start >= fa->total_nr_elements)
256	259	return -ENOSPC;
	260	+ if (!nr_elements)
	261	+ return 0;
	262	+
	263	+ end = start + nr_elements - 1;
	264	+
	265	+ if (end >= fa->total_nr_elements)
	266	+ return -ENOSPC;
257	267	if (elements_fit_in_base(fa))
258	268	return 0;
259	269	start_part = fa_element_to_part_nr(fa, start);
...	...	@@ -343,6 +353,8 @@
343	353	int part_nr;
344	354	int ret = 0;
345	355
	356	+ if (!fa->total_nr_elements)
	357	+ return 0;
346	358	if (elements_fit_in_base(fa))
347	359	return ret;
348	360	for (part_nr = 0; part_nr < FLEX_ARRAY_NR_BASE_PTRS; part_nr++) {
...	...	@@ -1578,7 +1578,8 @@
1578	1578	return rc;
1579	1579
1580	1580	if (!newsid \|\| !(sbsec->flags & SE_SBLABELSUPP)) {
1581		- rc = security_transition_sid(sid, dsec->sid, tclass, NULL, &newsid);
	1581	+ rc = security_transition_sid(sid, dsec->sid, tclass,
	1582	+ &dentry->d_name, &newsid);
1582	1583	if (rc)
1583	1584	return rc;
1584	1585	}
...	...	@@ -502,7 +502,7 @@
502	502	goto out;
503	503
504	504	rc = flex_array_prealloc(p->type_val_to_struct_array, 0,
505		- p->p_types.nprim - 1, GFP_KERNEL \| __GFP_ZERO);
	505	+ p->p_types.nprim, GFP_KERNEL \| __GFP_ZERO);
506	506	if (rc)
507	507	goto out;
508	508
...	...	@@ -519,7 +519,7 @@
519	519	goto out;
520	520
521	521	rc = flex_array_prealloc(p->sym_val_to_name[i],
522		- 0, p->symtab[i].nprim - 1,
	522	+ 0, p->symtab[i].nprim,
523	523	GFP_KERNEL \| __GFP_ZERO);
524	524	if (rc)
525	525	goto out;
...	...	@@ -2375,7 +2375,7 @@
2375	2375	goto bad;
2376	2376
2377	2377	/* preallocate so we don't have to worry about the put ever failing */
2378		- rc = flex_array_prealloc(p->type_attr_map_array, 0, p->p_types.nprim - 1,
	2378	+ rc = flex_array_prealloc(p->type_attr_map_array, 0, p->p_types.nprim,
2379	2379	GFP_KERNEL \| __GFP_ZERO);
2380	2380	if (rc)
2381	2381	goto bad;