From patchwork Sun Feb 26 09:09:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Talat Batheesh X-Patchwork-Id: 734190 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vYDpZ0Kykz9sNs; Wed, 1 Mar 2017 23:12:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="ICFXjlwx"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1cj37B-0005ZX-84; Wed, 01 Mar 2017 12:12:17 +0000 Received: from mail-db5eur01on0058.outbound.protection.outlook.com ([104.47.2.58] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1chuqY-0007qa-KM for kernel-team@lists.canonical.com; Sun, 26 Feb 2017 09:10:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=tuovMJYz23p2NJOkZBqFH0OGhqE3nyIw0yt5NGbJB+k=; b=ICFXjlwx5WulTTWUuIcKvedBVAzSS23GV9v1J6PFgE8512Tq5DeidZgTxudjZi/DIzhASh98HoVeKxs4MdeyJZPYnoNyiAQnNhlV4u9aT85fOXrmi/DhWb5BoRqQUsghP+8v0klttZApFZAAIccEKYHmG6Dv2duFlLUjbkWYuZs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=talatb@mellanox.com; Received: from dev-h-vrt-005.mth.labs.mlnx (193.47.165.251) by HE1PR05MB1306.eurprd05.prod.outlook.com (10.162.250.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Sun, 26 Feb 2017 09:10:24 +0000 From: Talat Batheesh To: Subject: [PATCH 12/18] net/sched: cls_flower: Properly handle classifier flags dumping Date: Sun, 26 Feb 2017 11:09:57 +0200 Message-ID: <1488100203-31976-12-git-send-email-talatb@mellanox.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1488100203-31976-1-git-send-email-talatb@mellanox.com> References: <1488100203-31976-1-git-send-email-talatb@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: AM4PR02CA0026.eurprd02.prod.outlook.com (10.165.239.164) To HE1PR05MB1306.eurprd05.prod.outlook.com (10.162.250.151) X-MS-Office365-Filtering-Correlation-Id: a8d6cb64-5ce1-4071-cd5e-08d45e274cd5 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:HE1PR05MB1306; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 3:P3GNO4JFOwPn3mcM3BXcpNsrhE+cydnm/YSwwZL/NA90KkugbeI2yt6H5SjcwGUcPo0huqkyUe1xrZIskQlpbLrw/BRRb2uolHpQcAii2lR2ze4XxI/PIJ1V8c4RtyHS60GK/zC0Pqlgs5Fyl/vTp+3C+5q7429tHTraiDXNuIb+LU/y4Fwvv/Ns87keBQS3JX7scmgyuk7E+bfSttjpc+MqCC9+/2FXzQD7qQZpsKm7W8TYiKAN/JLoZ1VqEXgIUTP3Q3OS8CHxnOCu5NrLJCqnqjvaAZB/4rZzYjPtWjk=; 25:fLlcQbpIpBstfjShBrdgtQiXQVYLnomOGiPbvhQE5c3mVTEWR2na5gSTojZl53NbK53ESva3EarDY+NX2paVGIH4JVUobq/10hq7IYlRut9I+RcJdFZDndUmnJ46m6gVipGqMjv3jfLWvdj0YC8tkOzKUAL4kQKXVFJnq6qemIHVM0DhsjE87GVez6NltXLCjo5DtNaCfjv81X3mjBVr/B772HSfp0Pj8WErnjhvkrzYYaeidZjqc1Mx4wgy46N621HzOKU9g3KISNCzZa8BiLuPIY2bOczQ5AoiCrRXPQcLYEXqRNgA1z5i2jRzxONTg75Ali48V9We1H31WP6vgiChKe+q3tBZp5eflAG3xBkgSf1woF+UL3Udx04ZVQJZ2L30E08IdGNti6sjVuY90g+LyerHbgwGNWkjvYhYZCpVbCIv+Z747TV9U3QYlXmkmHOlrv43zNOMl5Na+JEBEA== X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 31:+5Y13ifKTLEc7Ca3zftqwpmGLL7AFCx4at6ca3+jfoTACvO7boSKhtY1CSte5gDOWEAYESEyizcXbDKN5l0u1EUf3siFPi61d/yBOggnZlQjzEj1kd1N7SmDUX2vgWidjG+WB7SXMOzR4+T1CR3nQ4JJ9oTvjAqF0fRcttB3k0F+zaJQ4S3TIkxwW3ajIRYEtBXt2aAOcPku3uNDPvnOPRxyOPryW/VZpw2pzYG5tMA=; 20:Mq00TIcMLNiCXao+XpPFNKL3xUqGpVvjp8BJDC49e3/X5TyQuJ3oKjNfHaV/PiBJOw+5i8zsb7r4Jr39GcUROMOvGZY2bnsj5NMse4CMXWweoh2eH9aY1N/Lqj8mniiRQS9CkFkrfQCAXAj/zpeP2DDxvugIenJegOMwpt6y38nP/UisR7N+E1VeDVchgJ6tnWDfMR8CIDW/s/HMEXUb4wGVVAIWOzJzySZOV7c5DEeDDhija4FVSRkbHlUNOnsGIkd9ZYHXfhXyNvl6KSF1ErwLGdRbPkkb/WoeNT/8PNCwK8IRrJpnPqm/8TKmw4WHaJ0GGwjRRbV9XSThuzlWdp5UxHAOC2gf214LmEonsFxKVejoN/c31tMMyy6KEj25WhPxvLO5jziMq2OjcY9o8R2ABHFJbasXvjJcZ10h5GwGZKdLv7GWCUDe0+sOmRiSvp83pS5myhG1abfYR+XCwESe3QguV8/3Qik4WupqGGWIAFPsWbED8ixlwcQ/zKyL X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(211254476889703)(24339691489775); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123562025)(20161123555025)(20161123560025)(20161123564025)(6072148); SRVR:HE1PR05MB1306; BCL:0; PCL:0; RULEID:; SRVR:HE1PR05MB1306; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 4:OdJAh+Li8baGrupAcpruy39MvZRCnQLqF9T8KpGbYZCUp9kGEuz7XvFXxUx1qCY7W2+r9m2QRpztQWKtDY7Xaob8SzTgrbQkbJGaGX6usrYEYSfFXDzLgU4LSGbEUSujolscevHht/p1ewdyF4zmMzQEBusqje9Czgt8StQd59iN9P9KrXyk5qOmY6wlS2xoIxcacID0o5W9yJIlet6CAjUBxKaK/g+EX9Q+gjwmIskjN+CUB1j2GHaDJMV0PlOTB50xmloTVHHuLFDzeDt2kJToo5m/5XZjdoAhiZ42WrWcLgB0hQcLglDBXgbiWWHgxuKt8OVliqXwBKt6JC6sbDsSiV9B85HXubVTkR4V9Hu0RMZ/WndtfBGi/QTSlshTO/lvRjgfUDJOLUX5J06mgXNbAX6UajlgYocc4nnGvq/BX6T/3xbz/nIk0XTjlwUnXwelwcVqeRStNwSfB7m9EunfhvuOg9355E1kxMOZrv8X8/5ylIlnQ4bPJZk7NQacoAgrwiH+DZISYn+bI+mFUpLFy2k6YQyZ65qm5Qx3+ChemfpT80ryEwAkqhEIObNDDF6n36vEtMWHpsnad57SU7Ly6OzIH+4KMVgQzj2eDHhVVrprrx8Y4OUAEkwBvO4lSKiOU0ou91z726PpQ8x8GXJK8K+W570hCfzKEKeLP/TYSKWq3KS2gY5IraBZl3LVF7r9Kg7Pb2TlSBXPxO/T+w== X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39410400002)(39450400003)(39850400002)(39840400002)(199003)(189002)(68736007)(81166006)(8676002)(6512007)(81156014)(50226002)(3846002)(6116002)(50466002)(6506006)(48376002)(66066001)(6306002)(25786008)(47776003)(6666003)(2950100002)(5003940100001)(6916009)(6486002)(36756003)(5660300001)(101416001)(189998001)(92566002)(7736002)(107886003)(110136004)(33646002)(97736004)(105586002)(38730400002)(106356001)(2351001)(305945005)(76176999)(50986999)(4326007)(53936002)(2906002)(86362001)(42186005)(450100001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB1306; H:dev-h-vrt-005.mth.labs.mlnx; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR05MB1306; 23:seL13VC+BAGGjr9u1HFUyyfS4fcIikG+Q8jynPFSq?= =?us-ascii?Q?0aW+5EscTwem8bN3d+e+mgIoLOuIf7HVQa1z23AC4n+3iDV+PDpZze7eJl5n?= =?us-ascii?Q?f37suDSjdzePGSRPKIbzVSUzBP/cmRMTR4dB3HLBinD2Vms3mQednxwVu2k9?= =?us-ascii?Q?wFSvuxP1EbZLiliazT+05hBzVUmNybjSw3r64md7WDWMTLxuQ+x/LUcyh8/G?= =?us-ascii?Q?+6AlNW/IiMtHkUDxJg0liI3RUX27OaOK9po2v4uFIM0VC1Gu1zL5NPqDxPzS?= =?us-ascii?Q?Uu7VdVC6W6YVBwvjhT5Atk1LwpyOXaZKuSgrpvpmRo7Hjq8t+6gnMTq1vKx5?= =?us-ascii?Q?mNBHT10m4mkU9o8dfm/p6vH4sW4DH7OMOHpk+zm4QgVeWCNcPc+qlzLGkCHs?= =?us-ascii?Q?Hptmrv/1O5hYS3GG73mJlZMEmdEGZdAeqzt48C5cuZQk0qDn56Z+aD5A6Id9?= =?us-ascii?Q?vIjDHeAEOeqFtrEjMIa8XUFXPKfQ/AdZOUqKnwf3dWph2jE6AuNTvltysMN3?= =?us-ascii?Q?beqcsMyE35O2jgb6oqJ06PhewxpjjZAtUh7wTvYMLKsAcTojNRzP/uHRlQa+?= =?us-ascii?Q?3p8heMYXuIJJtGq3vy7/DvS7+HMidiH3dp2DRwKWlLVnnfmVssk2tCDx6IIU?= =?us-ascii?Q?7z0kkgPgtUdQIGtNIncf8R8yjz1N1JnO7Mi4VIm6S9OwhmUwN7+ShHakSbno?= =?us-ascii?Q?fxEYDePUTjf+OAHKT1ehCxX8xPTLvQWut33Wab90KsxUb16AuV50FgoP88yn?= =?us-ascii?Q?Uket/7wQD32b1FC0i2FYGOSytp0D4dC90Se+ryGbf+wfl/C/L7lonnV83XIH?= =?us-ascii?Q?LiYwd/ajzeVi7CbLprC3dDFGW6Phlf7j8hux+BLahFtnGdSg7hl/G/XoUfyR?= =?us-ascii?Q?Msi5dDj4zHQXnA+w8PrRf/PRWb1ICSd6b5cKoF7ms004O0eheJ4a/YJkfKWH?= =?us-ascii?Q?MdeYijiksrX82z5cffVumOAUW5jcuLaOjslJ23h2c4W+kNB1RJ3Oa6J0DfQg?= =?us-ascii?Q?MUCdB0ccWw7ix/u6GMgHIrkHzs3lptfnxvclMGJdyyuiB8gfb5/la8F0jVs9?= =?us-ascii?Q?9HSTUaA2ZPNEvM2+wI9wFuu2ehOQkwEwuCFR1NnpVzkTYn/i/pZM4otylR0x?= =?us-ascii?Q?UAKPsIUnLsNlT4WE1jEceeOpZdAcgVPgiI5IGKPVTqNgIwFko2ePVKquEfff?= =?us-ascii?Q?z3kaPfqU8hbrO5hE7VPumjSQo1jgjYlxSiuqLJJZbUwFWbP/99hagrAoPHF3?= =?us-ascii?Q?olK1r8ZJepiKOmD4qJ5vFDtwyWNO7MMwiNm7seV?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 6:E3Sg4bTatMP91l3gGJTI4MoxR9SAriOOuxhStamAwBr8VWPY9pyBcXMcDmP0q/8P3bBiCacifUdQ/KuhHV/SaGRpLVUh4C3Oj60zLMb6I+bfFdXXsOtLquaV26j5vo5Dok31/29SIqFcg5z8uum4otE+XSV3WDUqNduDmsPOnUMUWzrzDHYBsh2Ebf9GcoHj81W4B6Rv35ooEaz2RRcG5DTV7n1t18dKUerI6PQrET/j1HO+Ta07uEgUL0htfkvWyX/XOHaT7PQWuNzJdkzekweOlA/PTed5frF4JZbVtqWogFghFqjosb9HZQWfJIn0/aYeFlMlCOnUQ/2k6NMEeLBsJeCgD6YaffNBG8jsXMhXkkhKCvlGvMrzqNJAjoVzXSDZdlrAxOsHTIclhF4D53WHPV7II+ReqXJo2JFPOsc=; 5:mZ5xWF4n74VKZoJMWlxyMY+rMJfKSCZArmAX+kvB3y8cPeyJRhexbe0N2b5wiAqgQTWeK9dnKIpkQhrOjY2Jm29hhvyXFUD6VcOx8nMxNBHbLBLI2bZzi2oTIZsUTuYyA90H4pgYeWJX28DgsxxY31dS/VE2J1mcrF81QTEtkPs=; 24:tHKQFWhwpRrjfsAmfZqExjdDm4rkYiWDbtGPTo8pP1Eijh30DEzfIaMa8OiV6d4S5QMFcT0ZGKzHTYPiYvmOBq+aTmWBjwAgNXKXOx4acKU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 7:NTNMf6qWYPETtI9maGqFhOSJQA8OeXIRfL18JJLOFJRf9c9s8CRF5zgI57EcbtoI2wEtMud89PSL8oWJC+XmmqmzJUIcwOt3Pizn2+hQvxRCCKaprT2cl6JZSNR5wDtCyJP/Wd34+TmuMhiWzq44DReQ6wR9ONGh1rscZSH2gxHhYsfoIoeDWOyUrQ16FynueC34jWSswjsG67g0xZg2mKIcixQ21XnNB4xhGbOEOY126tZgwEtLeADwljRsKt+CetZbxP0jo6W5EBFBmmY81G8BNFjsWffz1hJTc8TtMXPYcsF4qFpMrvpbfHgP5cnotT2oApd3Bi9X4mTb46bsog== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 09:10:24.6923 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB1306 X-Mailman-Approved-At: Wed, 01 Mar 2017 12:12:14 +0000 Cc: talatb@mellanox.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Or Gerlitz BugLink: https://bugs.launchpad.net/ubuntu/1668019 Dump the classifier flags only if non zero and make sure to check the return status of the handler that puts them into the netlink msg. Signed-off-by: Or Gerlitz Signed-off-by: David S. Miller (cherry picked from commit 749e6720d2ee10d5221d5d7b8cee8ac5d1cd690e) Signed-off-by: Talat Batheesh --- net/sched/cls_flower.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index a9a3790..df4293e 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -1164,7 +1164,8 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, unsigned long fh, if (fl_dump_key_flags(skb, key->control.flags, mask->control.flags)) goto nla_put_failure; - nla_put_u32(skb, TCA_FLOWER_FLAGS, f->flags); + if (f->flags && nla_put_u32(skb, TCA_FLOWER_FLAGS, f->flags)) + goto nla_put_failure; if (tcf_exts_dump(skb, &f->exts)) goto nla_put_failure;