From patchwork Mon Jan 21 08:21:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1028394 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43jkrd1knmz9sCh for ; Mon, 21 Jan 2019 19:15:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728203AbfAUIPn (ORCPT ); Mon, 21 Jan 2019 03:15:43 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:46158 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727695AbfAUIPn (ORCPT ); Mon, 21 Jan 2019 03:15:43 -0500 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id B808AA0A7AFB5B84FB72; Mon, 21 Jan 2019 16:15:36 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.408.0; Mon, 21 Jan 2019 16:15:31 +0800 From: Wei Yongjun To: Jiri Pirko , Eran Ben Elisha CC: Wei Yongjun , , Subject: [PATCH net-next] devlink: Fix error return code in devlink_health_buffer_prepare_skb() Date: Mon, 21 Jan 2019 08:21:21 +0000 Message-ID: <1548058881-147159-1-git-send-email-weiyongjun1@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix to return a negative error code -EMSGSIZE from the error handling case, otherwise 0 or uninitialized value may be returned. Fixes: cb5ccfbe73b3 ("devlink: Add health buffer support") Signed-off-by: Wei Yongjun --- net/core/devlink.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index 60248a5..0d4c774 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -4008,8 +4008,10 @@ void devlink_health_buffer_nest_cancel(struct devlink_health_buffer *buffer) case DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_VALUE: case DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_VALUE_ARRAY: buffer_nlattr[i] = nla_nest_start(skb, desc->attrtype); - if (!buffer_nlattr[i]) + if (!buffer_nlattr[i]) { + err = -EMSGSIZE; goto nla_put_failure; + } i++; break; case DEVLINK_ATTR_HEALTH_BUFFER_OBJECT_VALUE_DATA: