Hillf Danton <dhillf@xxxxxxxxx> wrote:
> On Sat, Feb 25, 2012 at 10:27 AM, Eric Wong <normalperson@xxxxxxxx> wrote:
> > index 469491e0..f9e48dd 100644
> > --- a/mm/fadvise.c
> > +++ b/mm/fadvise.c
> > @@ -43,13 +43,13 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)
> > goto out;
> > }
> >
> > - mapping = file->f_mapping;
> > - if (!mapping || len < 0) {
> > + if (len < 0) {
>
> Current code makes sure mapping is valid after the above check,
Right. I moved the !mapping check down a few lines.
> > ret = -EINVAL;
> > goto out;
> > }
Now the check hits the "goto out" the get_xip_mem check hits:
> > - if (mapping->a_ops->get_xip_mem) {
> > + mapping = file->f_mapping;
> > + if (!mapping || mapping->a_ops->get_xip_mem) {
> > switch (advice) {
> > case POSIX_FADV_NORMAL:
> > case POSIX_FADV_RANDOM:
case POSIX_FADV_SEQUENTIAL:
case POSIX_FADV_WILLNEED:
case POSIX_FADV_NOREUSE:
case POSIX_FADV_DONTNEED:
/* no bad return value, but ignore advice */
break;
default:
ret = -EINVAL;
}
goto out; <------ we hit this if (mapping == NULL)
}
> but backing devices info is no longer evaluated with that
> guarantee in your change.
>
> -hd
>
> 75: bdi = mapping->backing_dev_info;
The above line still doesn't evaluated because of the goto.
out:
fput(file);
return ret;
}
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>