On Wed, Jul 27, 2016 at 6:57 AM, Phil Turnbull <phil.turnb...@oracle.com> wrote:
> -ENOMEM is never returned because the 'out' path unconditionally sets
> 'ret' to zero. Remove the 'out' path and return directly when the
> allocation fails.
>
> Fixes: 300aaeeaab5f ("[IPV6] SIT: Add SIOCGETPRL ioctl to get/dump PRL.")
> Signed-off-by: Phil Turnbull <phil.turnb...@oracle.com>
> ---
> net/ipv6/sit.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
> index 0619ac70836d..a71514040bb4 100644
> --- a/net/ipv6/sit.c
> +++ b/net/ipv6/sit.c
> @@ -320,8 +320,8 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
> */
> kp = kcalloc(ca, sizeof(*kp), GFP_ATOMIC);
> if (!kp) {
> - ret = -ENOMEM;
> - goto out;
> + rcu_read_unlock();
> + return -ENOMEM;
> }
Or even better: we don't have to do the second kcalloc()
within rcu read lock, we can move it before rcu_read_lock()?
