Re: [Xen-devel] [PATCH 08/12] add tpmfront, tpm_tis, and tpmback drivers to mini-os

[Matthew Fioravante <matthew.fioravante@xxxxxxxxxx>]

Wow for some reason I totally missed the rest of your long email
response. Anyway, comments below

On 10/02/2012 12:12 PM, Ian Campbell wrote:
> On Tue, 2012-10-02 at 15:58 +0100, Matthew Fioravante wrote:
>> diff --git a/extras/mini-os/include/tpm_tis.h 
>> b/extras/mini-os/include/tpm_tis.h
>> new file mode 100644
>> index 0000000..a076a70
>> --- /dev/null
>> +++ b/extras/mini-os/include/tpm_tis.h
>> @@ -0,0 +1,64 @@
>> +/*
>> + * Copyright (c) 2010-2012 United States Government, as represented by
>> + * the Secretary of Defense.  All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License
>> + * as published by the Free Software Foundation; either version 2
>> + * of the License, or (at your option) any later version.
> Sorry, but the original Linux files don't seem to use the "or (at your
> option) any later version" part so I think you must not either.
>
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
>> 02110-1301, USA.
>> + *
>> + * Based upon the files:
>> + *  drivers/char/tpm/tpm_tis.c
>> + *  drivers/char/tpm/tpm.c
>> + * from the Linux kernel, which are Copyright (C) 2006 IBM Corporation
>> + */
>> diff --git a/extras/mini-os/include/tpmback.h 
>> b/extras/mini-os/include/tpmback.h
>> new file mode 100644
>> index 0000000..4315e55
>> --- /dev/null
>> +++ b/extras/mini-os/include/tpmback.h
>> @@ -0,0 +1,96 @@
>> +/*
>> + * Copyright (c) 2010-2012 United States Government, as represented by
>> + * the Secretary of Defense.  All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License
>> + * as published by the Free Software Foundation; either version 2
>> + * of the License, or (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
>> 02110-1301, USA.
>> + *
>> + * Based upon the files:
>> + *  drivers/xen/tpmbk.c
> Where can I find this file? I looked in upstream Linux and
> linux-2.6.18-xen.hg.
In the internal tree I was using which was based off of xen linux
2.6.18, it was located there. It looks the current mercurial tree its
been moved to drivers/xen/tpmback.c.
>> diff --git a/extras/mini-os/include/tpmfront.h 
>> b/extras/mini-os/include/tpmfront.h
>> new file mode 100644
>> index 0000000..7e3d357
>> --- /dev/null
>> +++ b/extras/mini-os/include/tpmfront.h
>> @@ -0,0 +1,97 @@
>> +/*
>> + * Copyright (c) 2010-2012 United States Government, as represented by
>> + * the Secretary of Defense.  All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License
>> + * as published by the Free Software Foundation; either version 2
>> + * of the License, or (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
>> 02110-1301, USA.
>> + *
>> +
>> + *
>> + * Based upon the files:
>> + *  drivers/char/tpm/tpm_vtpm.c
> This one is GPLv2 only (not or later) also.
>
>> + *  drivers/char/tpm/tpm_xen.c
> This one does actually have the MIT alternative but given that you have
> combined it with the above it makes sense to omit that.
>
>> + * from the Linux kernel, which are Copyright (C) 2006 IBM Corporation
> tpm_xen.c also has "Copyright (c) 2002-2004, K A Fraser", not just IBM
> and that needs to be retained I think.
>
>> diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c
>> new file mode 100644
>> index 0000000..d94f798
>> --- /dev/null
>> +++ b/extras/mini-os/tpm_tis.c
>> @@ -0,0 +1,1345 @@
>> +/*
>> + * Copyright (c) 2010-2012 United States Government, as represented by
>> + * the Secretary of Defense.  All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License
>> + * as published by the Free Software Foundation; either version 2
>> + * of the License, or (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
>> 02110-1301, USA.
>> + *
>> + * Based upon the files:
>> + *  drivers/char/tpm/tpm_tis.c
>> + *  drivers/char/tpm/tpm.c
>> + * from the Linux kernel, which are Copyright (C) 2006 IBM Corporation
> You seem to have copied this 2006 date from one source and applied it to
> all these files even though the files which they are derived from have
> differing dates.
> e.g. drivers/char/tpm/tpm.c says "Copyright (C) 2004 IBM Corporation"
> while drivers/char/tpm/tpm_tis.c says "Copyright (C) 2005, 2006 IBM
> Corporation".
>
> I think it is important legally to retain the precise copyright for the
> code from which you have derived. I'm afraid this is going to
> re-checking against all the files you have derived from.
>
> You also need to retain any other copyrights, such as Keir's.
>
> I think this would be far less error prone if you were to copy the exact
> bits from each file. e.g.
>
> * Based upon the files:
> * ========
> * drivers/char/tpm/tpm_tis.c:
> * <literally paste the copyright block from tpm_tis.c>
> * =======
> * drivers/char/tpm/tpm.c:
> * <literally paste the copyright block from tpm.c>
> */
>
> And do this for every file which from which you have derived code.
>
> I'm sorry this is so tedious but it is important to get things like
> licensing and copyright ownership correct.
I was lazy to not pay attention to this more carefully, and for that I
apologize. A new patch will be coming with fixes.
>
>> diff --git a/extras/mini-os/tpmback.c b/extras/mini-os/tpmback.c
>> new file mode 100644
>> index 0000000..03bd20c
>> --- /dev/null
>> +++ b/extras/mini-os/tpmback.c
>> @@ -0,0 +1,1115 @@
>> +/*
>> + * Copyright (c) 2010-2012 United States Government, as represented by
>> + * the Secretary of Defense.  All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License
>> + * as published by the Free Software Foundation; either version 2
>> + * of the License, or (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
>> 02110-1301, USA.
>> + *
>> + * Based upon the files:
>> + *  drivers/xen/tpmbk.c
> Do you mean ./drivers/xen/tpmback/tpmback.c ?
See comment above
>
>> + * from the Linux kernel, which are Copyright (C) 2006 IBM Corporation
>> + */
> [...]
>> diff --git a/extras/mini-os/tpmfront.c b/extras/mini-os/tpmfront.c
>> new file mode 100644
>> index 0000000..84fc6af
>> --- /dev/null
>> +++ b/extras/mini-os/tpmfront.c
>> @@ -0,0 +1,607 @@
>> +/*
>> + * Copyright (c) 2010-2012 United States Government, as represented by
>> + * the Secretary of Defense.  All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License
>> + * as published by the Free Software Foundation; either version 2
>> + * of the License, or (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
>> 02110-1301, USA.
>> + *
>> + * Based upon the files:
>> + *  drivers/char/tpm/tpm_vtpm.c
>> + *  drivers/char/tpm/tpm_xen.c
>> + * from the Linux kernel, which are Copyright (C) 2006 IBM Corporation
> Again not "...or later".
>
> Ian.
>

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel