lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <0bdd3592-24ae-ab35-a6cd-40d842b127e0@redhat.com>
Date:   Mon, 15 Jun 2020 09:12:56 +0200
From:   Paolo Bonzini <pbonzini@...hat.com>
To:     paulmck@...nel.org, cai@....pw, elver@...gle.com
Cc:     linux-kernel@...r.kernel.org
Subject: Re: fastpath_t? __no_kcsan? Both?

On 15/06/20 06:20, Paul E. McKenney wrote:
> 
> I get the following conflict when rebasing 39a8c47635b0 ("kvm/svm:
> Disable KCSAN for svm_vcpu_run()") onto v5.8-rc1:
> 
> <<<<<<< 6c410247efb2d3907b508a2448ab9ab1c86d938c
> static fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)
> =======
> static __no_kcsan void svm_vcpu_run(struct kvm_vcpu *vcpu)
>>>>>>>> kvm/svm: Disable KCSAN for svm_vcpu_run()
> The "natural" resolution would be this:
> 
> static fastpath_t __no_kcsan void svm_vcpu_run(struct kvm_vcpu *vcpu)
> 
> But does that make sense?

fastpath_t is just an enum, so

	static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)

Now that KCSAN has been merged however I can do this change myself.

Thanks!

Paolo

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ