| @@ -1712,6 +1712,11 @@ static inline int should_follow_link(struct nameidata *nd, struct path *link, · 1711 unmodified lines |
| 1712 | return 0; | 1712 | return 0; |
| 1713 | if (!follow) | 1713 | if (!follow) |
| 1714 | return 0; | 1714 | return 0; |
| | 1715 | /* make sure that d_is_symlink above matches inode */ |
| | 1716 | if (nd->flags & LOOKUP_RCU) { |
| | 1717 | if (read_seqcount_retry(&link->dentry->d_seq, seq)) |
| | 1718 | return -ECHILD; |
| | 1719 | } |
| 1715 | return pick_link(nd, link, inode, seq); | 1720 | return pick_link(nd, link, inode, seq); |
| 1716 | } | 1721 | } |
| 1717 | | 1722 | |
| @@ -1743,11 +1748,11 @@ static int walk_component(struct nameidata *nd, int flags) · 25 unmodified lines |
| 1743 | if (err < 0) | 1748 | if (err < 0) |
| 1744 | return err; | 1749 | return err; |
| 1745 | | 1750 | |
| 1746 | inode = d_backing_inode(path.dentry); | | |
| 1747 | seq = 0; /* we are already out of RCU mode */ | 1751 | seq = 0; /* we are already out of RCU mode */ |
| 1748 | err = -ENOENT; | 1752 | err = -ENOENT; |
| 1749 | if (d_is_negative(path.dentry)) | 1753 | if (d_is_negative(path.dentry)) |
| 1750 | goto out_path_put; | 1754 | goto out_path_put; |
| | 1755 | inode = d_backing_inode(path.dentry); |
| 1751 | } | 1756 | } |
| 1752 | | 1757 | |
| 1753 | if (flags & WALK_PUT) | 1758 | if (flags & WALK_PUT) |
| @@ -3192,12 +3197,12 @@ retry_lookup: · 1438 unmodified lines |
| 3192 | return error; | 3197 | return error; |
| 3193 | | 3198 | |
| 3194 | BUG_ON(nd->flags & LOOKUP_RCU); | 3199 | BUG_ON(nd->flags & LOOKUP_RCU); |
| 3195 | inode = d_backing_inode(path.dentry); | | |
| 3196 | seq = 0; /* out of RCU mode, so the value doesn't matter */ | 3200 | seq = 0; /* out of RCU mode, so the value doesn't matter */ |
| 3197 | if (unlikely(d_is_negative(path.dentry))) { | 3201 | if (unlikely(d_is_negative(path.dentry))) { |
| 3198 | path_to_nameidata(&path, nd); | 3202 | path_to_nameidata(&path, nd); |
| 3199 | return -ENOENT; | 3203 | return -ENOENT; |
| 3200 | } | 3204 | } |
| | 3205 | inode = d_backing_inode(path.dentry); |
| 3201 | finish_lookup: | 3206 | finish_lookup: |
| 3202 | if (nd->depth) | 3207 | if (nd->depth) |
| 3203 | put_link(nd); | 3208 | put_link(nd); |
| @@ -3206,11 +3211,6 @@ finish_lookup: · 2 unmodified lines |
| 3206 | if (unlikely(error)) | 3211 | if (unlikely(error)) |
| 3207 | return error; | 3212 | return error; |
| 3208 | | 3213 | |
| 3209 | if (unlikely(d_is_symlink(path.dentry)) && !(open_flag & O_PATH)) { | | |
| 3210 | path_to_nameidata(&path, nd); | | |
| 3211 | return -ELOOP; | | |
| 3212 | } | | |
| 3213 | | | |
| 3214 | if ((nd->flags & LOOKUP_RCU) || nd->path.mnt != path.mnt) { | 3214 | if ((nd->flags & LOOKUP_RCU) || nd->path.mnt != path.mnt) { |
| 3215 | path_to_nameidata(&path, nd); | 3215 | path_to_nameidata(&path, nd); |
| 3216 | } else { | 3216 | } else { |
| @@ -3229,6 +3229,10 @@ finish_open: · 12 unmodified lines |
| 3229 | return error; | 3229 | return error; |
| 3230 | } | 3230 | } |
| 3231 | audit_inode(nd->name, nd->path.dentry, 0); | 3231 | audit_inode(nd->name, nd->path.dentry, 0); |
| | 3232 | if (unlikely(d_is_symlink(nd->path.dentry)) && !(open_flag & O_PATH)) { |
| | 3233 | error = -ELOOP; |
| | 3234 | goto out; |
| | 3235 | } |
| 3232 | error = -EISDIR; | 3236 | error = -EISDIR; |
| 3233 | if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry)) | 3237 | if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry)) |
| 3234 | goto out; | 3238 | goto out; |
| @@ -3273,6 +3277,10 @@ opened: · 38 unmodified lines |
| 3273 | goto exit_fput; | 3277 | goto exit_fput; |
| 3274 | } | 3278 | } |
| 3275 | out: | 3279 | out: |
| | 3280 | if (unlikely(error > 0)) { |
| | 3281 | WARN_ON(1); |
| | 3282 | error = -EINVAL; |
| | 3283 | } |
| 3276 | if (got_write) | 3284 | if (got_write) |
| 3277 | mnt_drop_write(nd->path.mnt); | 3285 | mnt_drop_write(nd->path.mnt); |
| 3278 | path_put(&save_parent); | 3286 | path_put(&save_parent); |