Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dab0badc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull keys update from James Morris:
 "There's nothing too controversial here:

   - Doc fix for keyctl_read().

   - time_t -> time64_t replacement.

   - Set the module licence on things to prevent tainting"

* 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  pkcs7: Set the module licence to prevent tainting
  security: keys: Replace time_t with time64_t for struct key_preparsed_payload
  security: keys: Replace time_t/timespec with time64_t
  KEYS: fix in-kernel documentation for keyctl_read()
parents 26064dea ce44cd8d

Documentation/security/keys/core.rst

+5 −5
Original line number Diff line number Diff line
@@ -628,12 +628,12 @@ The keyctl syscall functions are: 
     defined key type will return its data as is. If a key type does not

     implement this function, error EOPNOTSUPP will result.



     As much of the data as can be fitted into the buffer will be copied to

     userspace if the buffer pointer is not NULL.



     On a successful return, the function will always return the amount of data

     available rather than the amount copied.

     If the specified buffer is too small, then the size of the buffer required

     will be returned.  Note that in this case, the contents of the buffer may

     have been overwritten in some undefined way.



     Otherwise, on success, the function will return the amount of data copied

     into the buffer.



  *  Instantiate a partially constructed key::

crypto/asymmetric_keys/pkcs7_key_type.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("PKCS#7 testing key type");

MODULE_AUTHOR("Red Hat, Inc.");



static unsigned pkcs7_usage;

module_param_named(usage, pkcs7_usage, uint, S_IWUSR | S_IRUGO);

crypto/asymmetric_keys/pkcs7_parser.c

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#define pr_fmt(fmt) "PKCS7: "fmt

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/export.h>

#include <linux/slab.h>

#include <linux/err.h>
@@ -19,6 +20,10 @@ 
#include "pkcs7_parser.h"

#include "pkcs7-asn1.h"



MODULE_DESCRIPTION("PKCS#7 parser");

MODULE_AUTHOR("Red Hat, Inc.");

MODULE_LICENSE("GPL");



struct pkcs7_parse_context {

	struct pkcs7_message	*msg;		/* Message being constructed */

	struct pkcs7_signed_info *sinfo;	/* SignedInfo being constructed */

crypto/asymmetric_keys/public_key.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <crypto/public_key.h>

#include <crypto/akcipher.h>



MODULE_DESCRIPTION("In-software asymmetric public-key subtype");

MODULE_AUTHOR("Red Hat, Inc.");

MODULE_LICENSE("GPL");



/*

crypto/asymmetric_keys/x509_public_key.c

+1 −0
Original line number Diff line number Diff line
@@ -275,4 +275,5 @@ module_init(x509_key_init); 
module_exit(x509_key_exit);



MODULE_DESCRIPTION("X.509 certificate parser");

MODULE_AUTHOR("Red Hat, Inc.");

MODULE_LICENSE("GPL");