From patchwork Wed Feb 13 08:56:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 1041044 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=pass (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="F8YJkIYM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43ztgl2w2Gz9s4Z for ; Wed, 13 Feb 2019 19:57:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390902AbfBMI5F (ORCPT ); Wed, 13 Feb 2019 03:57:05 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:40446 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388056AbfBMI5F (ORCPT ); Wed, 13 Feb 2019 03:57:05 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x1D8rxUs106839; Wed, 13 Feb 2019 08:57:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : mime-version : content-type; s=corp-2018-07-02; bh=Egxih18p97lt7LNcyT18JgJYLiJe1EilZUt6+mSFF8Q=; b=F8YJkIYMTWlXDt5x+WRRRPVGSC3xtsDXw0igot1R1mYx7raOn/W/1SJg1xbyWpvaCuJ/ fKHXkBjSVC5KCCzpgnNOM0oxwpz4fXQ16L4rU396a1IFRIgVGE2UAV3C1qlXVEQPM26z ZvqIlN8QpmUYm7/K7hhXC8ywB8M5ZqsboOa+EJyS8XLExeIVGEKVLEQ1wWLdRPMBQto+ DcSOmIwoK+go0MZuRpNk1fCkwI1G4Y6c2loVZXMmHWhxg8tmkPQVqP+tIqmfDyTuktB6 3FT9QxmfdMZzpBCGo/v4T8sOYWs94hpxlL1Gl22lu/Tf7nPz7WOiBomjQdxAb5GDtbfE AQ== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2130.oracle.com with ESMTP id 2qhrekgn97-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Feb 2019 08:57:00 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x1D8uxk1031850 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Feb 2019 08:56:59 GMT Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x1D8uwU9025179; Wed, 13 Feb 2019 08:56:59 GMT Received: from kadam (/41.202.241.15) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 13 Feb 2019 08:56:58 +0000 Date: Wed, 13 Feb 2019 11:56:50 +0300 From: Dan Carpenter To: Jiri Pirko Cc: netdev@vger.kernel.org, Ido Schimmel , kernel-janitors@vger.kernel.org Subject: [PATCH 1/3 net-next] lib: objagg: Fix an error code in objagg_hints_get() Message-ID: <20190213085650.GB14113@kadam> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9165 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902130066 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need to set the error code on this path otherwise we return ERR_PTR(0) which would result in a NULL dereference in the caller. Fixes: 9069a3817d82 ("lib: objagg: implement optimization hints assembly and use hints for object creation") Signed-off-by: Dan Carpenter Acked-by: Jiri Pirko --- lib/objagg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/objagg.c b/lib/objagg.c index 781f41c3c47d..d552ec9c60ed 100644 --- a/lib/objagg.c +++ b/lib/objagg.c @@ -968,8 +968,10 @@ struct objagg_hints *objagg_hints_get(struct objagg *objagg, if (err) goto err_fillup_hints; - if (WARN_ON(objagg_hints->node_count != objagg->obj_count)) + if (WARN_ON(objagg_hints->node_count != objagg->obj_count)) { + err = -EINVAL; goto err_node_count_check; + } return objagg_hints; From patchwork Wed Feb 13 08:58:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 1041048 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=pass (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="qC777KBV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43ztjQ3GwCz9s4Z for ; Wed, 13 Feb 2019 19:58:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390915AbfBMI6d (ORCPT ); Wed, 13 Feb 2019 03:58:33 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:45118 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727264AbfBMI6c (ORCPT ); Wed, 13 Feb 2019 03:58:32 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x1D8sINF112542; Wed, 13 Feb 2019 08:58:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : mime-version : content-type : in-reply-to; s=corp-2018-07-02; bh=glLOTqUZOzjShB7h9qSIJThl3GIowp+Wk0rWMinmdMY=; b=qC777KBVfNDuSHmA3nlOq7t1c1elCeFOqs9KiRJWMbg6V/BwHIcBrwbJW1z5Mcw7FFky ncAxS2PCSwOVyW+gnE4zYS18XKjYgj71/dXd6v8sRxk2TrdgSgqKl3cXzeDpkuND+wHb YBDRQnyRhwRNy+h1Gd7XElPAtxBoxVA86/LsIr3BITLKV3Ji7KDBz/LV5qJ1p912FZMA xRCIYHbEn5NAHHaHHjGrLxj4gbXKbH7vkvx2oOtu1LBAg3GpJAcx8geqDW7llc6hP30b GzOJ3aTW17WRABdMJ7FVbQV4PP69R57AhizYrlRo1gaF4L7lXTSFdAG5WjKLaQoTr8FB Lw== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2120.oracle.com with ESMTP id 2qhree0pak-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Feb 2019 08:58:28 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x1D8wR1M004299 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Feb 2019 08:58:27 GMT Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x1D8wRTW016544; Wed, 13 Feb 2019 08:58:27 GMT Received: from kadam (/41.202.241.15) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 13 Feb 2019 00:58:27 -0800 Date: Wed, 13 Feb 2019 11:58:20 +0300 From: Dan Carpenter To: Jiri Pirko Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 2/3 net-next] test_objagg: Test the correct variable Message-ID: <20190213085820.GC14113@kadam> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190213085650.GB14113@kadam> X-Mailer: git-send-email haha only kidding User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9165 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902130066 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is a typo here. We intended to check "objagg2" but we instead test "objagg" which is not an error pointer. Fixes: 9069a3817d82 ("lib: objagg: implement optimization hints assembly and use hints for object creation") Signed-off-by: Dan Carpenter Acked-by: Jiri Pirko --- lib/test_objagg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/test_objagg.c b/lib/test_objagg.c index 3744573b6365..3dd45777b13c 100644 --- a/lib/test_objagg.c +++ b/lib/test_objagg.c @@ -952,8 +952,8 @@ static int test_hints_case(const struct hints_case *hints_case) } objagg2 = objagg_create(&delta_ops, hints, &world2); - if (IS_ERR(objagg)) - return PTR_ERR(objagg); + if (IS_ERR(objagg2)) + return PTR_ERR(objagg2); for (i = 0; i < hints_case->key_ids_count; i++) { objagg_obj = world_obj_get(&world2, objagg2, From patchwork Wed Feb 13 08:59:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 1041050 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=pass (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="aVpEit+H"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43ztkp198lz9s4Z for ; Wed, 13 Feb 2019 19:59:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390936AbfBMI7o (ORCPT ); Wed, 13 Feb 2019 03:59:44 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:51788 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727264AbfBMI7o (ORCPT ); Wed, 13 Feb 2019 03:59:44 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x1D8s2au113766; Wed, 13 Feb 2019 08:59:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : mime-version : content-type : in-reply-to; s=corp-2018-07-02; bh=qxHbh9jgoM1ADveRFv8IF88OfeciXqMTWyF2jPLyKg4=; b=aVpEit+HxnYDoe/QfyhZBjsYB6m9b2/uceGjBXji20MzPqvspjVKyQOPBJ7koE8gRtRA YNtJw2crxFKYeV1MtLc3Ehw4Ll6u0/vTDsCL/T1QRobWe1R6Ivbn/Ag9hfQcqiy4iwS4 ryksQ+DkSkcukF4Bi0nLJK2+NP5kCmSe5g03j9Z/Idr02nnoCTMHRNJRECf3ElAhl3qM vEHFWIHtCQbdM+VZhy4X4+pT/VTOg2rI5OlAfml2kYulgvJTXlGjtf4qSsfUc7oON/ab 3a+Md9MEXIST0eNh6NGyVPB9yeQJvkrhKj0SPeehsz7CS4DdOVZH+QchaBDqonILLWF+ SQ== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2130.oracle.com with ESMTP id 2qhre5gmqu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Feb 2019 08:59:40 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x1D8xdDT029897 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Feb 2019 08:59:39 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x1D8xchq013161; Wed, 13 Feb 2019 08:59:39 GMT Received: from kadam (/41.202.241.15) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 13 Feb 2019 00:59:38 -0800 Date: Wed, 13 Feb 2019 11:59:31 +0300 From: Dan Carpenter To: Jiri Pirko Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 3/3 net-next] test_objagg: Uninitialized variable in error handling Message-ID: <20190213085931.GD14113@kadam> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190213085650.GB14113@kadam> X-Mailer: git-send-email haha only kidding User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9165 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902130066 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need to set the error message on this path otherwise some of the callers, such as test_hints_case(), print from an uninitialized pointer. We had a similar bug earlier and set "errmsg" to NULL in the caller, test_delta_action_item(). That code is no longer required so I have removed it. Fixes: 9069a3817d82 ("lib: objagg: implement optimization hints assembly and use hints for object creation") Signed-off-by: Dan Carpenter Acked-by: Jiri Pirko --- lib/test_objagg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/test_objagg.c b/lib/test_objagg.c index 3dd45777b13c..72c1abfa154d 100644 --- a/lib/test_objagg.c +++ b/lib/test_objagg.c @@ -745,8 +745,10 @@ static int check_expect_stats(struct objagg *objagg, int err; stats = objagg_stats_get(objagg); - if (IS_ERR(stats)) + if (IS_ERR(stats)) { + *errmsg = "objagg_stats_get() failed."; return PTR_ERR(stats); + } err = __check_expect_stats(stats, expect_stats, errmsg); objagg_stats_put(stats); return err; @@ -786,7 +788,6 @@ static int test_delta_action_item(struct world *world, if (err) goto errout; - errmsg = NULL; err = check_expect_stats(objagg, &action_item->expect_stats, &errmsg); if (err) { pr_err("Key %u: Stats: %s\n", action_item->key_id, errmsg);