Re: [PATCH] dm.c : Check memory allocations

[Kevin Corry <corry@ecn.purdue.edu>]

> On Fri, Dec 27, 2002 at 04:55:31PM -0500, Kevin Corry wrote:
> > Check memory allocations when cloning bio's.
> > 
> > --- linux-2.5.53a/drivers/md/dm.c	Mon Dec 23 23:21:04 2002
> > +++ linux-2.5.53b/drivers/md/dm.c	Fri Dec 27 14:50:29 2002
> > @@ -394,6 +393,10 @@
> >  		 */
> >  		clone = clone_bio(bio, ci->sector, ci->idx,
> >  				  bio->bi_vcnt - ci->idx, ci->sector_count);
> > +		if (!clone) {
> > +			dec_pending(ci->io, -ENOMEM);
> > +			return;
> > +		}
> >  		__map_bio(ti, clone, ci->io);
> >  		ci->sector_count = 0;
> >  
> > @@ -417,6 +420,10 @@
> >  		}
> >  
> >  		clone = clone_bio(bio, ci->sector, ci->idx, i - ci->idx, len);
> > +		if (!clone) {
> > +			dec_pending(ci->io, -ENOMEM);
> > +			return;
> > +		}
> >  		__map_bio(ti, clone, ci->io);
> >  
> >  		ci->sector += len;
> 
> 
> This seems a bit insufficient.  Why is this error not propagated up
> through to __split_bio ?
> 
> 	Jeff

At second glance, it does seem insufficient. I had simply copied the
same check that was already used later in __clone_and_map().

What we should do is set ci->sector_count to zero. This will prevent
__split_bio() from performing any further processing on the bio.

Alternatively, we could change __clone_and_map() to return an int, and
return the error to __split_bio() and let it do the cleanup.

Here is a replacement patch based on the first suggestion.

-Kevin

--- linux-2.5.53a/drivers/md/dm.c	Mon Dec 23 23:21:04 2002
+++ linux-2.5.53b/drivers/md/dm.c	Fri Dec 27 15:18:19 2002
@@ -394,6 +393,11 @@
 		 */
 		clone = clone_bio(bio, ci->sector, ci->idx,
 				  bio->bi_vcnt - ci->idx, ci->sector_count);
+		if (!clone) {
+			ci->sector_count = 0;
+			dec_pending(ci->io, -ENOMEM);
+			return;
+		}
 		__map_bio(ti, clone, ci->io);
 		ci->sector_count = 0;
 
@@ -417,6 +421,11 @@
 		}
 
 		clone = clone_bio(bio, ci->sector, ci->idx, i - ci->idx, len);
+		if (!clone) {
+			ci->sector_count = 0;
+			dec_pending(ci->io, -ENOMEM);
+			return;
+		}
 		__map_bio(ti, clone, ci->io);
 
 		ci->sector += len;
@@ -433,6 +442,7 @@
 		clone = split_bvec(bio, ci->sector, ci->idx,
 				   bv->bv_offset, max);
 		if (!clone) {
+			ci->sector_count = 0;
 			dec_pending(ci->io, -ENOMEM);
 			return;
 		}
@@ -447,6 +457,7 @@
 		clone = split_bvec(bio, ci->sector, ci->idx,
 				   bv->bv_offset + to_bytes(max), len);
 		if (!clone) {
+			ci->sector_count = 0;
 			dec_pending(ci->io, -ENOMEM);
 			return;
 		}