From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752448AbdKICCt (ORCPT <rfc822;w@1wt.eu>);
        Wed, 8 Nov 2017 21:02:49 -0500
Received: from s3.sipsolutions.net ([144.76.63.242]:37352 "EHLO
        sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751728AbdKICCa (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 8 Nov 2017 21:02:30 -0500
Message-ID: <1510192934.11466.0.camel@sipsolutions.net>
Subject: Re: [PATCH v3] af_netlink: ensure that NLMSG_DONE never fails in
 dumps
From: Johannes Berg <johannes@sipsolutions.net>
To: "Jason A. Donenfeld" <Jason@zx2c4.com>, davem@davemloft.net,
        Netdev <netdev@vger.kernel.org>, linux-kernel@vger.kernel.org
Date: Thu, 09 Nov 2017 03:02:14 +0100
In-Reply-To: <20171109014218.20562-1-Jason@zx2c4.com>
References: <20171108072141.1786-1-Jason@zx2c4.com>
         <20171109014218.20562-1-Jason@zx2c4.com>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.26.0-1 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, 2017-11-09 at 10:42 +0900, Jason A. Donenfeld wrote:
> +++ b/net/netlink/af_netlink.c
> @@ -2136,7 +2136,7 @@ static int netlink_dump(struct sock *sk)
>  	struct sk_buff *skb = NULL;
>  	struct nlmsghdr *nlh;
>  	struct module *module;
> -	int len, err = -ENOBUFS;
> +	int err = -ENOBUFS;
>  	int alloc_min_size;
>  	int alloc_size;
>  
> @@ -2183,9 +2183,10 @@ static int netlink_dump(struct sock *sk)
>  	skb_reserve(skb, skb_tailroom(skb) - alloc_size);
>  	netlink_skb_set_owner_r(skb, sk);
>  
> -	len = cb->dump(skb, cb);
> +	if (nlk->dump_done_errno > 0)
> +		nlk->dump_done_errno = cb->dump(skb, cb);
>  
> -	if (len > 0) {
> +	if (nlk->dump_done_errno > 0 || skb_tailroom(skb) < nlmsg_total_size(sizeof(nlk->dump_done_errno))) {
>  		mutex_unlock(nlk->cb_mutex);

nit: I think your line got a little long here :)
 
> -	memcpy(nlmsg_data(nlh), &len, sizeof(len));
> +	memcpy(nlmsg_data(nlh), &nlk->dump_done_errno, sizeof(nlk->dump_done_errno));

and here

> +	nlk->dump_done_errno = INT_MAX;

I guess positive values aren't really returned from dump?

johannes