Attachment 16236 Details for Bug 49841

[patch] Proposed patch from me.

rock.c.diff (text/plain), 1.81 KB, created by Sebastian Krahmer on 2004-02-27 17:57:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Krahmer

Created: 2004-02-27 17:57:25 UTC

Size: 1.81 KB

patch

obsolete

>--- rock.c.orig	2004-02-24 22:37:53.000000000 -0800
>+++ rock.c	2004-02-24 22:45:45.000000000 -0800
>@@ -14,6 +14,7 @@
> #include <linux/slab.h>
> #include <linux/pagemap.h>
> #include <linux/smp_lock.h>
>+#include <asm/page.h>
> 
> #include "rock.h"
> 
>@@ -419,7 +420,7 @@
>   return 0;
> }
> 
>-static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr)
>+static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *pstart)
> {
> 	int slen;
> 	int rootflag;
>@@ -431,16 +432,24 @@
> 		rootflag = 0;
> 		switch (slp->flags & ~1) {
> 		case 0:
>+			if (rpnt - pstart + slp->len >= PAGE_SIZE)
>+				return rpnt;
> 			memcpy(rpnt, slp->text, slp->len);
> 			rpnt+=slp->len;
> 			break;
> 		case 4:
>+			if (rpnt - pstart + 1 >= PAGE_SIZE)
>+				return rpnt;
> 			*rpnt++='.';
> 			/* fallthru */
> 		case 2:
>+			if (rpnt - pstart + 1 >= PAGE_SIZE)
>+				return rpnt;
> 			*rpnt++='.';
> 			break;
> 		case 8:
>+			if (rpnt - pstart + 1 >= PAGE_SIZE)
>+				return rpnt;
> 			rootflag = 1;
> 			*rpnt++='/';
> 			break;
>@@ -457,7 +466,9 @@
> 			 * If there is another SL record, and this component
> 			 * record isn't continued, then add a slash.
> 			 */
>-			if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1))
>+			if ((!rootflag) && (rr->u.SL.flags & 1) &&
>+			    !(oldslp->flags & 1) &&
>+			    rpnt - pstart + 1 < PAGE_SIZE)
> 				*rpnt++='/';
> 			break;
> 		}
>@@ -465,7 +476,8 @@
> 		/*
> 		 * If this component record isn't continued, then append a '/'.
> 		 */
>-		if (!rootflag && !(oldslp->flags & 1))
>+		if (!rootflag && !(oldslp->flags & 1) &&
>+		    rpnt - pstart + 1 < PAGE_SIZE)
> 			*rpnt++='/';
> 
> 	}
>@@ -548,7 +560,7 @@
> 			CHECK_SP(goto out);
> 			break;
> 		case SIG('S', 'L'):
>-			rpnt = get_symlink_chunk(rpnt, rr);
>+			rpnt = get_symlink_chunk(rpnt, rr, link);
> 			break;
> 		case SIG('C', 'E'):
> 			/* This tells is if there is a continuation record */

Actions: View | Diff

Attachments on bug 49841: 16111 | 16235 | 16236