On Mon, Oct 28, 2013 at 7:00 PM, Wei Yongjun <weiyj...@gmail.com> wrote:
> From: Wei Yongjun <yongjun_...@trendmicro.com.cn>
>
> In case of error, the function iget_locked() returns NULL pointer
> not ERR_PTR(). The IS_ERR() test in the return value check should
> be replaced with NULL test.
>
> Signed-off-by: Wei Yongjun <yongjun_...@trendmicro.com.cn>

Good catch, thanks!

Acked-by: Kees Cook <keesc...@chromium.org>

As an aside, Dan, how hard would this kind of mismatch be to detect with smatch?

-Kees

> ---
>  fs/befs/linuxvfs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
> index e9c75e2..d714dda 100644
> --- a/fs/befs/linuxvfs.c
> +++ b/fs/befs/linuxvfs.c
> @@ -319,8 +319,8 @@ static struct inode *befs_iget(struct super_block *sb, 
> unsigned long ino)
>         befs_debug(sb, "---> befs_read_inode() " "inode = %lu", ino);
>
>         inode = iget_locked(sb, ino);
> -       if (IS_ERR(inode))
> -               return inode;
> +       if (!inode)
> +               return ERR_PTR(-ENOMEM);
>         if (!(inode->i_state & I_NEW))
>                 return inode;
>
>



-- 
Kees Cook
Chrome OS Security
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to