From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752569AbcHQNV1 (ORCPT ); Wed, 17 Aug 2016 09:21:27 -0400 Received: from smtprelay0005.hostedemail.com ([216.40.44.5]:43228 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751463AbcHQNV0 (ORCPT ); Wed, 17 Aug 2016 09:21:26 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::::::::::::::::::::::::::::::::::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3352:3622:3865:3871:3873:5007:6261:6742:6743:7875:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12296:12438:12517:12519:12740:13069:13311:13357:13439:14181:14659:14721:14777:21080:21433:30022:30054:30064:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:3,LUA_SUMMARY:none X-HE-Tag: brush31_284b7e9d925c X-Filterd-Recvd-Size: 3473 Date: Wed, 17 Aug 2016 09:20:16 -0400 From: Steven Rostedt To: Kees Cook Cc: "Paul E . McKenney" , Laura Abbott , Stephen Boyd , Daniel Micay , Joe Perches , Arnd Bergmann , Greg Kroah-Hartman , Josh Triplett , Mathieu Desnoyers , Lai Jiangshan , "Aneesh Kumar K.V" , "Kirill A. Shutemov" , Michael Ellerman , Dan Williams , Andrew Morton , Ingo Molnar , Thomas Gleixner , Josef Bacik , Andrey Ryabinin , Tejun Heo , Nikolay Aleksandrov , Dmitry Vyukov , linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com Subject: Re: [PATCH v2 4/5] bug: Provide toggle for BUG on data corruption Message-ID: <20160817092016.30f8fc5c@gandalf.local.home> In-Reply-To: <1471393229-27182-5-git-send-email-keescook@chromium.org> References: <1471393229-27182-1-git-send-email-keescook@chromium.org> <1471393229-27182-5-git-send-email-keescook@chromium.org> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 16 Aug 2016 17:20:28 -0700 Kees Cook wrote: > EXPORT_SYMBOL(__list_add_valid); > @@ -46,26 +41,18 @@ bool __list_del_entry_valid(struct list_head *entry) > prev = entry->prev; > next = entry->next; > > - if (unlikely(next == LIST_POISON1)) { > - WARN(1, "list_del corruption, %p->next is LIST_POISON1 (%p)\n", > - entry, LIST_POISON1); > - return false; > - } > - if (unlikely(prev == LIST_POISON2)) { > - WARN(1, "list_del corruption, %p->prev is LIST_POISON2 (%p)\n", > - entry, LIST_POISON2); > - return false; > - } > - if (unlikely(prev->next != entry)) { > - WARN(1, "list_del corruption. prev->next should be %p, but was %p\n", > - entry, prev->next); > - return false; > - } > - if (unlikely(next->prev != entry)) { > - WARN(1, "list_del corruption. next->prev should be %p, but was %p\n", > - entry, next->prev); > - return false; > - } > + CHECK_DATA_CORRUPTION(next == LIST_POISON1, > + "list_del corruption, %p->next is LIST_POISON1 (%p)\n", > + entry, LIST_POISON1); > + CHECK_DATA_CORRUPTION(prev == LIST_POISON2, > + "list_del corruption, %p->prev is LIST_POISON2 (%p)\n", > + entry, LIST_POISON2); > + CHECK_DATA_CORRUPTION(prev->next != entry, > + "list_del corruption. prev->next should be %p, but was %p\n", > + entry, prev->next); > + CHECK_DATA_CORRUPTION(next->prev != entry, > + "list_del corruption. next->prev should be %p, but was %p\n", > + entry, next->prev); OK, you totally rewrote the WARN() section anyway, thus ignore my comment on the previous email. -- Steve > return true; > > }